@@ -10,7 +10,7 @@ discard block |
||
| 10 | 10 | class HtmlOption extends HtmlDoubleElement { |
| 11 | 11 | protected $value; |
| 12 | 12 | protected $selected; |
| 13 | - public function __construct($identifier,$caption,$value="") { |
|
| 13 | + public function __construct($identifier, $caption, $value="") { |
|
| 14 | 14 | parent::__construct($identifier, "option"); |
| 15 | 15 | $this->_template='<option id="%identifier%" value="%value%" %selected% %properties%>%content%</option>'; |
| 16 | 16 | $this->content=$caption; |
@@ -18,7 +18,7 @@ discard block |
||
| 18 | 18 | $this->selected=""; |
| 19 | 19 | } |
| 20 | 20 | |
| 21 | - public function select(){ |
|
| 21 | + public function select() { |
|
| 22 | 22 | $this->selected="selected"; |
| 23 | 23 | return $this; |
| 24 | 24 | } |
@@ -27,7 +27,7 @@ discard block |
||
| 27 | 27 | return $this->value; |
| 28 | 28 | } |
| 29 | 29 | public function setValue($value) { |
| 30 | - $this->value = $value; |
|
| 30 | + $this->value=$value; |
|
| 31 | 31 | return $this; |
| 32 | 32 | } |
| 33 | 33 | |
@@ -7,7 +7,7 @@ |
||
| 7 | 7 | |
| 8 | 8 | class HtmlImg extends HtmlSingleElement { |
| 9 | 9 | |
| 10 | - public function __construct($identifier,$src="",$alt="") { |
|
| 10 | + public function __construct($identifier, $src="", $alt="") { |
|
| 11 | 11 | parent::__construct($identifier, "img"); |
| 12 | 12 | $this->setSrc($src); |
| 13 | 13 | $this->setAlt($alt); |
@@ -14,8 +14,8 @@ |
||
| 14 | 14 | parent::__construct($identifier, "ul"); |
| 15 | 15 | $this->addItems($items); |
| 16 | 16 | } |
| 17 | - public function setOrdered($ordered=true){ |
|
| 18 | - $this->tagName=($ordered===true)?"ol":"ul"; |
|
| 17 | + public function setOrdered($ordered=true) { |
|
| 18 | + $this->tagName=($ordered===true) ? "ol" : "ul"; |
|
| 19 | 19 | } |
| 20 | 20 | |
| 21 | 21 | /** |
@@ -25,7 +25,7 @@ discard block |
||
| 25 | 25 | public function addOption($element,$value="",$selected=false){ |
| 26 | 26 | if($element instanceof HtmlOption){ |
| 27 | 27 | $option=$element; |
| 28 | - }else{ |
|
| 28 | + } else{ |
|
| 29 | 29 | $option=new HtmlOption($this->identifier."-".count($this->options), $element,$value); |
| 30 | 30 | } |
| 31 | 31 | if($selected || $option->getValue()==$this->getProperty("value")){ |
@@ -64,7 +64,7 @@ discard block |
||
| 64 | 64 | foreach ($array as $k=>$v){ |
| 65 | 65 | $this->addOption($v, $k); |
| 66 | 66 | } |
| 67 | - }else{ |
|
| 67 | + } else{ |
|
| 68 | 68 | foreach ($array as $v){ |
| 69 | 69 | $this->addOption($v, $v); |
| 70 | 70 | } |
@@ -13,7 +13,7 @@ discard block |
||
| 13 | 13 | private $default; |
| 14 | 14 | private $options; |
| 15 | 15 | |
| 16 | - public function __construct($identifier, $caption="",$default=NULL) { |
|
| 16 | + public function __construct($identifier, $caption="", $default=NULL) { |
|
| 17 | 17 | parent::__construct($identifier, "select"); |
| 18 | 18 | $this->setProperty("name", $identifier); |
| 19 | 19 | $this->setProperty("class", "form-control"); |
@@ -22,21 +22,21 @@ discard block |
||
| 22 | 22 | $this->options=array(); |
| 23 | 23 | } |
| 24 | 24 | |
| 25 | - public function addOption($element,$value="",$selected=false){ |
|
| 26 | - if($element instanceof HtmlOption){ |
|
| 25 | + public function addOption($element, $value="", $selected=false) { |
|
| 26 | + if ($element instanceof HtmlOption) { |
|
| 27 | 27 | $option=$element; |
| 28 | - }else{ |
|
| 29 | - $option=new HtmlOption($this->identifier."-".count($this->options), $element,$value); |
|
| 28 | + } else { |
|
| 29 | + $option=new HtmlOption($this->identifier."-".count($this->options), $element, $value); |
|
| 30 | 30 | } |
| 31 | - if($selected || $option->getValue()==$this->getProperty("value")){ |
|
| 31 | + if ($selected || $option->getValue()==$this->getProperty("value")) { |
|
| 32 | 32 | $option->select(); |
| 33 | 33 | } |
| 34 | 34 | $this->options[]=$option; |
| 35 | 35 | } |
| 36 | 36 | |
| 37 | 37 | public function setValue($value) { |
| 38 | - foreach ( $this->options as $option ) { |
|
| 39 | - if (strcasecmp($option->getValue(),$value)===0) { |
|
| 38 | + foreach ($this->options as $option) { |
|
| 39 | + if (strcasecmp($option->getValue(), $value)===0) { |
|
| 40 | 40 | $option->setProperty("selected", ""); |
| 41 | 41 | } |
| 42 | 42 | } |
@@ -49,23 +49,23 @@ discard block |
||
| 49 | 49 | */ |
| 50 | 50 | public function compile(JsUtils $js=NULL, &$view=NULL) { |
| 51 | 51 | $this->content=array(); |
| 52 | - if(isset($this->default)){ |
|
| 52 | + if (isset($this->default)) { |
|
| 53 | 53 | $default=new HtmlOption("", $this->default); |
| 54 | 54 | $this->content[]=$default; |
| 55 | 55 | } |
| 56 | - foreach ($this->options as $option){ |
|
| 56 | + foreach ($this->options as $option) { |
|
| 57 | 57 | $this->content[]=$option; |
| 58 | 58 | } |
| 59 | 59 | return parent::compile($js, $view); |
| 60 | 60 | } |
| 61 | 61 | |
| 62 | - public function fromArray($array){ |
|
| 63 | - if(JArray::isAssociative($array)){ |
|
| 64 | - foreach ($array as $k=>$v){ |
|
| 62 | + public function fromArray($array) { |
|
| 63 | + if (JArray::isAssociative($array)) { |
|
| 64 | + foreach ($array as $k=>$v) { |
|
| 65 | 65 | $this->addOption($v, $k); |
| 66 | 66 | } |
| 67 | - }else{ |
|
| 68 | - foreach ($array as $v){ |
|
| 67 | + } else { |
|
| 68 | + foreach ($array as $v) { |
|
| 69 | 69 | $this->addOption($v, $v); |
| 70 | 70 | } |
| 71 | 71 | } |
@@ -98,7 +98,7 @@ discard block |
||
| 98 | 98 | $this->addOption($function($object)); |
| 99 | 99 | } |
| 100 | 100 | |
| 101 | - public function setSize($size){ |
|
| 101 | + public function setSize($size) { |
|
| 102 | 102 | return $this->setProperty("size", $size); |
| 103 | 103 | } |
| 104 | 104 | } |
@@ -7,7 +7,7 @@ discard block |
||
| 7 | 7 | use Phalcon\Mvc\View; |
| 8 | 8 | use Phalcon\Mvc\Controller; |
| 9 | 9 | |
| 10 | -class JsUtils extends \Ajax\JsUtils implements InjectionAwareInterface{ |
|
| 10 | +class JsUtils extends \Ajax\JsUtils implements InjectionAwareInterface { |
|
| 11 | 11 | protected $_di; |
| 12 | 12 | public function setDi(DiInterface $di) { |
| 13 | 13 | $this->_di=$di; |
@@ -18,50 +18,50 @@ discard block |
||
| 18 | 18 | return $this->_di; |
| 19 | 19 | } |
| 20 | 20 | |
| 21 | - public function getUrl($url){ |
|
| 21 | + public function getUrl($url) { |
|
| 22 | 22 | return $this->_di->get("url")->get($url); |
| 23 | 23 | } |
| 24 | 24 | |
| 25 | - public function addViewElement($identifier,$content,&$view){ |
|
| 25 | + public function addViewElement($identifier, $content, &$view) { |
|
| 26 | 26 | $controls=$view->getVar("q"); |
| 27 | - if (isset($controls) === false) { |
|
| 28 | - $controls=array (); |
|
| 27 | + if (isset($controls)===false) { |
|
| 28 | + $controls=array(); |
|
| 29 | 29 | } |
| 30 | 30 | $controls[$identifier]=$content; |
| 31 | 31 | $view->setVar("q", $controls); |
| 32 | 32 | } |
| 33 | 33 | |
| 34 | - public function createScriptVariable(&$view,$view_var, $output){ |
|
| 35 | - $view->setVar($view_var,$output); |
|
| 34 | + public function createScriptVariable(&$view, $view_var, $output) { |
|
| 35 | + $view->setVar($view_var, $output); |
|
| 36 | 36 | } |
| 37 | 37 | |
| 38 | - public function forward($initialController,$controller,$action,$params=array()){ |
|
| 39 | - $dispatcher = $initialController->dispatcher; |
|
| 38 | + public function forward($initialController, $controller, $action, $params=array()) { |
|
| 39 | + $dispatcher=$initialController->dispatcher; |
|
| 40 | 40 | $dispatcher->setControllerName($controller); |
| 41 | 41 | $dispatcher->setActionName($action); |
| 42 | 42 | $dispatcher->dispatch(); |
| 43 | - $template=$initialController->view->getRender($dispatcher->getControllerName(), $dispatcher->getActionName(),$dispatcher->getParams(), function ($view) { |
|
| 43 | + $template=$initialController->view->getRender($dispatcher->getControllerName(), $dispatcher->getActionName(), $dispatcher->getParams(), function($view) { |
|
| 44 | 44 | $view->setRenderLevel(View::LEVEL_ACTION_VIEW); |
| 45 | 45 | }); |
| 46 | 46 | return $template; |
| 47 | 47 | } |
| 48 | 48 | |
| 49 | - public function renderContent($initialControllerInstance,$viewName, $params=NULL) { |
|
| 50 | - list($controller,$action)=\explode("@", $viewName); |
|
| 51 | - $template=$initialControllerInstance->view->getRender($controller, $action, $params, function ($view) { |
|
| 49 | + public function renderContent($initialControllerInstance, $viewName, $params=NULL) { |
|
| 50 | + list($controller, $action)=\explode("@", $viewName); |
|
| 51 | + $template=$initialControllerInstance->view->getRender($controller, $action, $params, function($view) { |
|
| 52 | 52 | $view->setRenderLevel(View::LEVEL_ACTION_VIEW); |
| 53 | 53 | }); |
| 54 | 54 | return $template; |
| 55 | 55 | } |
| 56 | 56 | |
| 57 | - public function fromDispatcher($dispatcher){ |
|
| 57 | + public function fromDispatcher($dispatcher) { |
|
| 58 | 58 | $params=$dispatcher->getParams(); |
| 59 | 59 | $action=$dispatcher->getActionName(); |
| 60 | 60 | $items=array($dispatcher->getControllerName()); |
| 61 | - if(\sizeof($params)>0 || \strtolower($action)!="index" ){ |
|
| 61 | + if (\sizeof($params)>0 || \strtolower($action)!="index") { |
|
| 62 | 62 | $items[]=$action; |
| 63 | - foreach ($params as $p){ |
|
| 64 | - if(\is_object($p)===false) |
|
| 63 | + foreach ($params as $p) { |
|
| 64 | + if (\is_object($p)===false) |
|
| 65 | 65 | $items[]=$p; |
| 66 | 66 | } |
| 67 | 67 | } |
@@ -61,8 +61,9 @@ |
||
| 61 | 61 | if(\sizeof($params)>0 || \strtolower($action)!="index" ){ |
| 62 | 62 | $items[]=$action; |
| 63 | 63 | foreach ($params as $p){ |
| 64 | - if(\is_object($p)===false) |
|
| 65 | - $items[]=$p; |
|
| 64 | + if(\is_object($p)===false) { |
|
| 65 | + $items[]=$p; |
|
| 66 | + } |
|
| 66 | 67 | } |
| 67 | 68 | } |
| 68 | 69 | return $items; |
@@ -6,8 +6,9 @@ |
||
| 6 | 6 | |
| 7 | 7 | class JsUtils extends \Ajax\JsUtils{ |
| 8 | 8 | public function getUrl($url){ |
| 9 | - if($url==="") |
|
| 10 | - $url="/"; |
|
| 9 | + if($url==="") { |
|
| 10 | + $url="/"; |
|
| 11 | + } |
|
| 11 | 12 | return Url::toRoute($url); |
| 12 | 13 | } |
| 13 | 14 | |
@@ -4,14 +4,14 @@ discard block |
||
| 4 | 4 | |
| 5 | 5 | use yii\helpers\Url; |
| 6 | 6 | |
| 7 | -class JsUtils extends \Ajax\JsUtils{ |
|
| 8 | - public function getUrl($url){ |
|
| 9 | - if($url==="") |
|
| 7 | +class JsUtils extends \Ajax\JsUtils { |
|
| 8 | + public function getUrl($url) { |
|
| 9 | + if ($url==="") |
|
| 10 | 10 | $url="/"; |
| 11 | 11 | return Url::toRoute($url); |
| 12 | 12 | } |
| 13 | 13 | |
| 14 | - public function addViewElement($identifier,$content,&$view){ |
|
| 14 | + public function addViewElement($identifier, $content, &$view) { |
|
| 15 | 15 | $params=$view->params; |
| 16 | 16 | if (\array_key_exists("q", $params)===false) { |
| 17 | 17 | $view->params["q"]=array(); |
@@ -19,11 +19,11 @@ discard block |
||
| 19 | 19 | $view->params["q"][$identifier]=$content; |
| 20 | 20 | } |
| 21 | 21 | |
| 22 | - public function createScriptVariable(&$view,$view_var, $output){ |
|
| 22 | + public function createScriptVariable(&$view, $view_var, $output) { |
|
| 23 | 23 | $view->params[$view_var]=$output; |
| 24 | 24 | } |
| 25 | 25 | |
| 26 | - public function forward($initialControllerInstance,$controllerName,$actionName,$params=array()){ |
|
| 26 | + public function forward($initialControllerInstance, $controllerName, $actionName, $params=array()) { |
|
| 27 | 27 | \ob_start(); |
| 28 | 28 | $ctrInfo=\yii::$app->createController($controllerName."/".$actionName); |
| 29 | 29 | $ctrInfo[0]->{$ctrInfo[1]}($params); |
@@ -32,11 +32,11 @@ discard block |
||
| 32 | 32 | return $result; |
| 33 | 33 | } |
| 34 | 34 | |
| 35 | - public function renderContent($initialControllerInstance,$viewName, $params=NULL) { |
|
| 36 | - return \yii::$app->view->render($viewName,$params); |
|
| 35 | + public function renderContent($initialControllerInstance, $viewName, $params=NULL) { |
|
| 36 | + return \yii::$app->view->render($viewName, $params); |
|
| 37 | 37 | } |
| 38 | 38 | |
| 39 | - public function fromDispatcher($dispatcher){ |
|
| 39 | + public function fromDispatcher($dispatcher) { |
|
| 40 | 40 | $uri=new \Ajax\php\yii\URI(); |
| 41 | 41 | return $uri->segment_array(); |
| 42 | 42 | } |
@@ -1,9 +1,9 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | -return array ( |
|
| 3 | - "JQuery" => array ( |
|
| 4 | - "MaxCDN" => array ( |
|
| 2 | +return array( |
|
| 3 | + "JQuery" => array( |
|
| 4 | + "MaxCDN" => array( |
|
| 5 | 5 | "url" => "http://code.jquery.com/jquery-%version%.min.js", |
| 6 | - "versions" => array ( |
|
| 6 | + "versions" => array( |
|
| 7 | 7 | "2.2.3", |
| 8 | 8 | "2.2.1", |
| 9 | 9 | "2.1.4", |
@@ -11,9 +11,9 @@ discard block |
||
| 11 | 11 | "1.11.2" |
| 12 | 12 | ) |
| 13 | 13 | ), |
| 14 | - "Google" => array ( |
|
| 14 | + "Google" => array( |
|
| 15 | 15 | "url" => "https://ajax.googleapis.com/ajax/libs/jquery/%version%/jquery.min.js", |
| 16 | - "versions" => array ( |
|
| 16 | + "versions" => array( |
|
| 17 | 17 | "2.2.2", |
| 18 | 18 | "2.2.1", |
| 19 | 19 | "2.2.0", |
@@ -25,17 +25,17 @@ discard block |
||
| 25 | 25 | ) |
| 26 | 26 | ) |
| 27 | 27 | ), |
| 28 | - "JQueryUI" => array ( |
|
| 29 | - "MaxCDN" => array ( |
|
| 28 | + "JQueryUI" => array( |
|
| 29 | + "MaxCDN" => array( |
|
| 30 | 30 | "core" => "http://code.jquery.com/ui/%version%/jquery-ui.min.js", |
| 31 | 31 | "css" => "http://code.jquery.com/ui/%version%/themes/%theme%/jquery-ui.css", |
| 32 | - "versions" => array ( |
|
| 32 | + "versions" => array( |
|
| 33 | 33 | "1.11.4", |
| 34 | 34 | "1.11.3", |
| 35 | 35 | "1.11.2", |
| 36 | 36 | "1.10.4" |
| 37 | 37 | ), |
| 38 | - "themes" => array ( |
|
| 38 | + "themes" => array( |
|
| 39 | 39 | "black-tie", |
| 40 | 40 | "blitzer", |
| 41 | 41 | "cupertino", |
@@ -62,10 +62,10 @@ discard block |
||
| 62 | 62 | "vader" |
| 63 | 63 | ) |
| 64 | 64 | ), |
| 65 | - "Google" => array ( |
|
| 65 | + "Google" => array( |
|
| 66 | 66 | "core" => "https://ajax.googleapis.com/ajax/libs/jqueryui/%version%/jquery-ui.min.js", |
| 67 | 67 | "css" => "https://ajax.googleapis.com/ajax/libs/jqueryui/%version%/themes/%theme%/jquery-ui.css", |
| 68 | - "versions" => array ( |
|
| 68 | + "versions" => array( |
|
| 69 | 69 | "1.11.4", |
| 70 | 70 | "1.11.3", |
| 71 | 71 | "1.11.2", |
@@ -74,7 +74,7 @@ discard block |
||
| 74 | 74 | "1.10.4", |
| 75 | 75 | "1.10.0" |
| 76 | 76 | ), |
| 77 | - "themes" => array ( |
|
| 77 | + "themes" => array( |
|
| 78 | 78 | "black-tie", |
| 79 | 79 | "blitzer", |
| 80 | 80 | "cupertino", |
@@ -102,25 +102,25 @@ discard block |
||
| 102 | 102 | ) |
| 103 | 103 | ) |
| 104 | 104 | ), |
| 105 | - "Bootstrap" => array ( |
|
| 106 | - "MaxCDN" => array ( |
|
| 105 | + "Bootstrap" => array( |
|
| 106 | + "MaxCDN" => array( |
|
| 107 | 107 | "core" => "http://maxcdn.bootstrapcdn.com/bootstrap/%version%/js/bootstrap.min.js", |
| 108 | 108 | "css" => "http://maxcdn.bootstrapcdn.com/bootstrap/%version%/css/bootstrap.min.css", |
| 109 | - "versions" => array ( |
|
| 109 | + "versions" => array( |
|
| 110 | 110 | "3.3.6", |
| 111 | 111 | "3.3.5" |
| 112 | 112 | ), |
| 113 | - "themes" => array () |
|
| 113 | + "themes" => array() |
|
| 114 | 114 | ) |
| 115 | 115 | ), |
| 116 | - "Semantic" => array ( |
|
| 117 | - "cdnjs" => array ( |
|
| 116 | + "Semantic" => array( |
|
| 117 | + "cdnjs" => array( |
|
| 118 | 118 | "core" => "https://cdnjs.cloudflare.com/ajax/libs/semantic-ui/%version%/semantic.min.js", |
| 119 | 119 | "css" => "https://cdnjs.cloudflare.com/ajax/libs/semantic-ui/%version%/semantic.min.css", |
| 120 | - "versions" => array ( |
|
| 120 | + "versions" => array( |
|
| 121 | 121 | "2.1.8" |
| 122 | 122 | ), |
| 123 | - "themes" => array () |
|
| 123 | + "themes" => array() |
|
| 124 | 124 | ) |
| 125 | 125 | ) |
| 126 | 126 | ); |
| 127 | 127 | \ No newline at end of file |
@@ -9,7 +9,7 @@ |
||
| 9 | 9 | protected $localCss; |
| 10 | 10 | protected $framework; |
| 11 | 11 | |
| 12 | - public function __construct($framework,$version, $provider="MaxCDN") { |
|
| 12 | + public function __construct($framework, $version, $provider="MaxCDN") { |
|
| 13 | 13 | parent::__construct($version, $provider); |
| 14 | 14 | $this->framework=$framework; |
| 15 | 15 | $this->data=$this->data [$framework]; |
@@ -60,10 +60,10 @@ |
||
| 60 | 60 | |
| 61 | 61 | protected function replaceVersionAndTheme($url, $version, $theme) { |
| 62 | 62 | if (isset($theme)) |
| 63 | - return str_ireplace(array ( |
|
| 63 | + return str_ireplace(array( |
|
| 64 | 64 | "%theme%", |
| 65 | 65 | "%version%" |
| 66 | - ), array ( |
|
| 66 | + ), array( |
|
| 67 | 67 | $theme, |
| 68 | 68 | $version |
| 69 | 69 | ), $url); |
@@ -33,11 +33,13 @@ discard block |
||
| 33 | 33 | } |
| 34 | 34 | |
| 35 | 35 | protected function getUrlOrCss($element, $key) { |
| 36 | - if (isset($element)) |
|
| 37 | - return $element; |
|
| 36 | + if (isset($element)) { |
|
| 37 | + return $element; |
|
| 38 | + } |
|
| 38 | 39 | $version=$this->version; |
| 39 | - if (array_search($version, $this->getVersions())===false) |
|
| 40 | - $version=$this->getLastVersion(); |
|
| 40 | + if (array_search($version, $this->getVersions())===false) { |
|
| 41 | + $version=$this->getLastVersion(); |
|
| 42 | + } |
|
| 41 | 43 | return $this->replaceVersion($this->data [$this->provider] [$key], $version); |
| 42 | 44 | } |
| 43 | 45 | |
@@ -59,16 +61,17 @@ discard block |
||
| 59 | 61 | } |
| 60 | 62 | |
| 61 | 63 | protected function replaceVersionAndTheme($url, $version, $theme) { |
| 62 | - if (isset($theme)) |
|
| 63 | - return str_ireplace(array ( |
|
| 64 | + if (isset($theme)) { |
|
| 65 | + return str_ireplace(array ( |
|
| 64 | 66 | "%theme%", |
| 65 | 67 | "%version%" |
| 66 | 68 | ), array ( |
| 67 | 69 | $theme, |
| 68 | 70 | $version |
| 69 | 71 | ), $url); |
| 70 | - else |
|
| 71 | - return $this->replaceVersion($url, $version); |
|
| 72 | + } else { |
|
| 73 | + return $this->replaceVersion($url, $version); |
|
| 74 | + } |
|
| 72 | 75 | } |
| 73 | 76 | |
| 74 | 77 | public function getProviders() { |
@@ -76,10 +79,11 @@ discard block |
||
| 76 | 79 | } |
| 77 | 80 | |
| 78 | 81 | public function getVersions($provider=NULL) { |
| 79 | - if (isset($provider)) |
|
| 80 | - return $this->data [$provider] ["versions"]; |
|
| 81 | - else |
|
| 82 | - return $this->data [$this->provider] ["versions"]; |
|
| 82 | + if (isset($provider)) { |
|
| 83 | + return $this->data [$provider] ["versions"]; |
|
| 84 | + } else { |
|
| 85 | + return $this->data [$this->provider] ["versions"]; |
|
| 86 | + } |
|
| 83 | 87 | } |
| 84 | 88 | |
| 85 | 89 | public function getLastVersion($provider=NULL) { |