@@ -17,7 +17,7 @@ discard block |
||
| 17 | 17 | foreach ($items as $k=>$v){ |
| 18 | 18 | $this->addItem([$k,$v]); |
| 19 | 19 | } |
| 20 | - }else{ |
|
| 20 | + } else{ |
|
| 21 | 21 | foreach ($items as $item){ |
| 22 | 22 | $this->addItem($item); |
| 23 | 23 | } |
@@ -53,9 +53,9 @@ discard block |
||
| 53 | 53 | * @return \Ajax\common\html\HtmlDoubleElement |
| 54 | 54 | */ |
| 55 | 55 | public function getItem($index) { |
| 56 | - if (is_int($index)) |
|
| 57 | - return $this->content[$index]; |
|
| 58 | - else { |
|
| 56 | + if (is_int($index)) { |
|
| 57 | + return $this->content[$index]; |
|
| 58 | + } else { |
|
| 59 | 59 | $elm=$this->getElementById($index, $this->content); |
| 60 | 60 | return $elm; |
| 61 | 61 | } |
@@ -24,9 +24,9 @@ |
||
| 24 | 24 | } |
| 25 | 25 | |
| 26 | 26 | public static function getConstantValues($postFix=""){ |
| 27 | - if($postFix!=="") |
|
| 28 | - return \array_values(self::getConstants()); |
|
| 29 | - else{ |
|
| 27 | + if($postFix!=="") { |
|
| 28 | + return \array_values(self::getConstants()); |
|
| 29 | + } else{ |
|
| 30 | 30 | return \array_map(function ($elem) use ($postFix) {return $elem." ".$postFix;},\array_values(self::getConstants())); |
| 31 | 31 | } |
| 32 | 32 | } |
@@ -92,8 +92,9 @@ discard block |
||
| 92 | 92 | if(\sizeof($params)>0 || \strtolower($action)!="index" ){ |
| 93 | 93 | $items[]=$action; |
| 94 | 94 | foreach ($params as $p){ |
| 95 | - if(\is_object($p)===false) |
|
| 96 | - $items[]=$p; |
|
| 95 | + if(\is_object($p)===false) { |
|
| 96 | + $items[]=$p; |
|
| 97 | + } |
|
| 97 | 98 | } |
| 98 | 99 | } |
| 99 | 100 | return $this->addItems($items); |
@@ -111,7 +112,7 @@ discard block |
||
| 111 | 112 | } |
| 112 | 113 | if($this->absolutePaths===true){ |
| 113 | 114 | return $this->_hrefFunction($this->content[$index]); |
| 114 | - }else{ |
|
| 115 | + } else{ |
|
| 115 | 116 | return $this->root.implode($separator, array_slice(array_map(function($e){return $this->_hrefFunction($e);}, $this->content),$this->startIndex,$index+1)); |
| 116 | 117 | } |
| 117 | 118 | } |
@@ -165,8 +166,9 @@ discard block |
||
| 165 | 166 | |
| 166 | 167 | public function _ajaxOn($operation, $event, $url, $responseElement="", $parameters=array()) { |
| 167 | 168 | foreach ($this->content as $element){ |
| 168 | - if($element->getProperty($this->attr)!=NULL) |
|
| 169 | - $element->_ajaxOn($operation, $event, $url, $responseElement, $parameters); |
|
| 169 | + if($element->getProperty($this->attr)!=NULL) { |
|
| 170 | + $element->_ajaxOn($operation, $event, $url, $responseElement, $parameters); |
|
| 171 | + } |
|
| 170 | 172 | } |
| 171 | 173 | return $this; |
| 172 | 174 | } |
@@ -178,9 +180,9 @@ discard block |
||
| 178 | 180 | protected function createItem($value) { |
| 179 | 181 | $count=$this->count(); |
| 180 | 182 | $itemO=new HtmlSemDoubleElement("item-".$this->identifier."-".$count,"a","section"); |
| 181 | - if(\is_array($value)) |
|
| 182 | - $itemO->fromArray($value); |
|
| 183 | - else{ |
|
| 183 | + if(\is_array($value)) { |
|
| 184 | + $itemO->fromArray($value); |
|
| 185 | + } else{ |
|
| 184 | 186 | $itemO->setContent($value); |
| 185 | 187 | $itemO->setProperty($this->attr, $this->getHref($count)); |
| 186 | 188 | } |
@@ -16,7 +16,7 @@ discard block |
||
| 16 | 16 | $this->addToPropertyCtrl("class", $direction." icon", Direction::getConstantValues("icon")); |
| 17 | 17 | $this->addContent($iconO,false); |
| 18 | 18 | $this->_hasIcon=true; |
| 19 | - }else{ |
|
| 19 | + } else{ |
|
| 20 | 20 | $iconO=$this->getIcon(); |
| 21 | 21 | $iconO->setIcon($icon); |
| 22 | 22 | $this->addToPropertyCtrl("class", $direction." icon", Direction::getConstantValues("icon")); |
@@ -27,8 +27,9 @@ discard block |
||
| 27 | 27 | public function getIcon(){ |
| 28 | 28 | if(\is_array($this->content)){ |
| 29 | 29 | foreach ($this->content as $item){ |
| 30 | - if($item instanceof HtmlIcon) |
|
| 31 | - return $item; |
|
| 30 | + if($item instanceof HtmlIcon) { |
|
| 31 | + return $item; |
|
| 32 | + } |
|
| 32 | 33 | } |
| 33 | 34 | } |
| 34 | 35 | } |
@@ -96,10 +96,11 @@ |
||
| 96 | 96 | |
| 97 | 97 | protected function setDivider($divider,$index){ |
| 98 | 98 | if(isset($index)){ |
| 99 | - if(\is_array($this->_contentSeparator)===false) |
|
| 100 | - $this->_contentSeparator=array_fill (0, $this->count()-1,$this->_contentSeparator); |
|
| 99 | + if(\is_array($this->_contentSeparator)===false) { |
|
| 100 | + $this->_contentSeparator=array_fill (0, $this->count()-1,$this->_contentSeparator); |
|
| 101 | + } |
|
| 101 | 102 | $this->_contentSeparator[$index]=$divider; |
| 102 | - }else{ |
|
| 103 | + } else{ |
|
| 103 | 104 | $this->_contentSeparator=$divider; |
| 104 | 105 | } |
| 105 | 106 | return $this; |
@@ -50,8 +50,9 @@ discard block |
||
| 50 | 50 | |
| 51 | 51 | protected function _setDi($di) { |
| 52 | 52 | $this->_di=$di; |
| 53 | - if ($this->js!=null&&$di!=null) |
|
| 54 | - $this->js->setDi($di); |
|
| 53 | + if ($this->js!=null&&$di!=null) { |
|
| 54 | + $this->js->setDi($di); |
|
| 55 | + } |
|
| 55 | 56 | } |
| 56 | 57 | |
| 57 | 58 | /** |
@@ -1130,12 +1131,14 @@ discard block |
||
| 1130 | 1131 | $result[1]=$cdn; |
| 1131 | 1132 | break; |
| 1132 | 1133 | case "Ajax\lib\CDNCoreCss": |
| 1133 | - if($cdn->getFramework()==="Bootstrap") |
|
| 1134 | - $hasBootstrap=true; |
|
| 1135 | - elseif($cdn->getFramework()==="Semantic") |
|
| 1136 | - $hasSemantic=true; |
|
| 1137 | - if($hasSemantic || $hasBootstrap) |
|
| 1138 | - $result[2]=$cdn; |
|
| 1134 | + if($cdn->getFramework()==="Bootstrap") { |
|
| 1135 | + $hasBootstrap=true; |
|
| 1136 | + } elseif($cdn->getFramework()==="Semantic") { |
|
| 1137 | + $hasSemantic=true; |
|
| 1138 | + } |
|
| 1139 | + if($hasSemantic || $hasBootstrap) { |
|
| 1140 | + $result[2]=$cdn; |
|
| 1141 | + } |
|
| 1139 | 1142 | break; |
| 1140 | 1143 | } |
| 1141 | 1144 | } |
@@ -34,8 +34,9 @@ |
||
| 34 | 34 | * @see BaseHtml::run() |
| 35 | 35 | */ |
| 36 | 36 | public function run(JsUtils $js) { |
| 37 | - if(isset($this->_bsComponent)===false) |
|
| 38 | - $this->_bsComponent=$js->semantic()->accordion("#".$this->identifier,$this->params); |
|
| 37 | + if(isset($this->_bsComponent)===false) { |
|
| 38 | + $this->_bsComponent=$js->semantic()->accordion("#".$this->identifier,$this->params); |
|
| 39 | + } |
|
| 39 | 40 | $this->addEventsOnRun($js); |
| 40 | 41 | return $this->_bsComponent; |
| 41 | 42 | } |
@@ -31,8 +31,9 @@ discard block |
||
| 31 | 31 | protected function createTitleElement(){ |
| 32 | 32 | $element=new HtmlSemDoubleElement("title-".$this->identifier,"div","title"); |
| 33 | 33 | $element->setContent(array(new HtmlIcon("", $this->_icon),$this->_title)); |
| 34 | - if($this->_active===true) |
|
| 35 | - $element->addToProperty("class", "active"); |
|
| 34 | + if($this->_active===true) { |
|
| 35 | + $element->addToProperty("class", "active"); |
|
| 36 | + } |
|
| 36 | 37 | return $element; |
| 37 | 38 | } |
| 38 | 39 | |
@@ -43,10 +44,11 @@ discard block |
||
| 43 | 44 | |
| 44 | 45 | public function setActive($value=true){ |
| 45 | 46 | $this->_active=$value; |
| 46 | - if($value===true) |
|
| 47 | - $this->addToPropertyCtrl("class", "active", array("active")); |
|
| 48 | - else |
|
| 49 | - $this->removePropertyValue("class", "active"); |
|
| 47 | + if($value===true) { |
|
| 48 | + $this->addToPropertyCtrl("class", "active", array("active")); |
|
| 49 | + } else { |
|
| 50 | + $this->removePropertyValue("class", "active"); |
|
| 51 | + } |
|
| 50 | 52 | return $this; |
| 51 | 53 | } |
| 52 | 54 | } |
| 53 | 55 | \ No newline at end of file |
@@ -8,8 +8,9 @@ discard block |
||
| 8 | 8 | public function __construct($identifier, $field,$label=NULL) { |
| 9 | 9 | parent::__construct($identifier, "div","ui field"); |
| 10 | 10 | $this->content=array(); |
| 11 | - if(isset($label)) |
|
| 12 | - $this->setLabel($label); |
|
| 11 | + if(isset($label)) { |
|
| 12 | + $this->setLabel($label); |
|
| 13 | + } |
|
| 13 | 14 | $this->setField($field); |
| 14 | 15 | } |
| 15 | 16 | |
@@ -28,8 +29,9 @@ discard block |
||
| 28 | 29 | } |
| 29 | 30 | |
| 30 | 31 | public function getLabel(){ |
| 31 | - if(\array_key_exists("label", $this->content)) |
|
| 32 | - return $this->content["label"]; |
|
| 32 | + if(\array_key_exists("label", $this->content)) { |
|
| 33 | + return $this->content["label"]; |
|
| 34 | + } |
|
| 33 | 35 | } |
| 34 | 36 | |
| 35 | 37 | public function getField(){ |