@@ -36,7 +36,7 @@ |
||
| 36 | 36 | foreach ($icons as $icon=>$size){ |
| 37 | 37 | $group->addIcon($icon,$size); |
| 38 | 38 | } |
| 39 | - }else{ |
|
| 39 | + } else{ |
|
| 40 | 40 | foreach ($icons as $icon){ |
| 41 | 41 | $group->addIcon($icon); |
| 42 | 42 | } |
@@ -173,10 +173,12 @@ discard block |
||
| 173 | 173 | if (isset($param)) { |
| 174 | 174 | $param=$this->_prep_value($param); |
| 175 | 175 | $str="$({$element}).{$jQueryCall}({$param});"; |
| 176 | - } else |
|
| 177 | - $str="$({$element}).{$jQueryCall}();"; |
|
| 178 | - if ($immediatly) |
|
| 179 | - $this->jquery_code_for_compile[]=$str; |
|
| 176 | + } else { |
|
| 177 | + $str="$({$element}).{$jQueryCall}();"; |
|
| 178 | + } |
|
| 179 | + if ($immediatly) { |
|
| 180 | + $this->jquery_code_for_compile[]=$str; |
|
| 181 | + } |
|
| 180 | 182 | return $str; |
| 181 | 183 | } |
| 182 | 184 | /** |
@@ -191,8 +193,9 @@ discard block |
||
| 191 | 193 | $to=$this->_prep_element($to); |
| 192 | 194 | $element=$this->_prep_element($element); |
| 193 | 195 | $str="$({$to}).{$jQueryCall}({$element});"; |
| 194 | - if ($immediatly) |
|
| 195 | - $this->jquery_code_for_compile[]=$str; |
|
| 196 | + if ($immediatly) { |
|
| 197 | + $this->jquery_code_for_compile[]=$str; |
|
| 198 | + } |
|
| 196 | 199 | return $str; |
| 197 | 200 | } |
| 198 | 201 | // -------------------------------------------------------------------- |
@@ -260,12 +263,14 @@ discard block |
||
| 260 | 263 | if ($stopPropagation===true) { |
| 261 | 264 | $js="event.stopPropagation();\n".$js; |
| 262 | 265 | } |
| 263 | - if (array_search($event, $this->jquery_events)===false) |
|
| 264 | - $event="\n\t$(".$this->_prep_element($element).").bind('{$event}',function(event){\n\t\t{$js}\n\t});\n"; |
|
| 265 | - else |
|
| 266 | - $event="\n\t$(".$this->_prep_element($element).").{$event}(function(event){\n\t\t{$js}\n\t});\n"; |
|
| 267 | - if($immediatly) |
|
| 268 | - $this->jquery_code_for_compile[]=$event; |
|
| 266 | + if (array_search($event, $this->jquery_events)===false) { |
|
| 267 | + $event="\n\t$(".$this->_prep_element($element).").bind('{$event}',function(event){\n\t\t{$js}\n\t});\n"; |
|
| 268 | + } else { |
|
| 269 | + $event="\n\t$(".$this->_prep_element($element).").{$event}(function(event){\n\t\t{$js}\n\t});\n"; |
|
| 270 | + } |
|
| 271 | + if($immediatly) { |
|
| 272 | + $this->jquery_code_for_compile[]=$event; |
|
| 273 | + } |
|
| 269 | 274 | return $event; |
| 270 | 275 | } |
| 271 | 276 | |
@@ -326,8 +331,9 @@ discard block |
||
| 326 | 331 | } |
| 327 | 332 | $output=($script_tags===FALSE) ? $script : $this->inline($script); |
| 328 | 333 | |
| 329 | - if ($view!=NULL) |
|
| 330 | - $view->setVar($view_var, $output); |
|
| 334 | + if ($view!=NULL) { |
|
| 335 | + $view->setVar($view_var, $output); |
|
| 336 | + } |
|
| 331 | 337 | return $output; |
| 332 | 338 | } |
| 333 | 339 | |
@@ -421,7 +427,9 @@ discard block |
||
| 421 | 427 | } |
| 422 | 428 | |
| 423 | 429 | private function minify($input) { |
| 424 | - if(trim($input) === "") return $input; |
|
| 430 | + if(trim($input) === "") { |
|
| 431 | + return $input; |
|
| 432 | + } |
|
| 425 | 433 | return preg_replace( |
| 426 | 434 | array( |
| 427 | 435 | // Remove comment(s) |
@@ -57,9 +57,9 @@ discard block |
||
| 57 | 57 | $item=$itemO; |
| 58 | 58 | } |
| 59 | 59 | $item=parent::addItem($item); |
| 60 | - if(!$item instanceof HtmlMenu) |
|
| 61 | - $item->addToPropertyCtrl("class", "item",array("item")); |
|
| 62 | - else{ |
|
| 60 | + if(!$item instanceof HtmlMenu) { |
|
| 61 | + $item->addToPropertyCtrl("class", "item",array("item")); |
|
| 62 | + } else{ |
|
| 63 | 63 | $this->setSecondary(); |
| 64 | 64 | } |
| 65 | 65 | return $item; |
@@ -129,8 +129,9 @@ discard block |
||
| 129 | 129 | |
| 130 | 130 | public function asTab($vertical=false){ |
| 131 | 131 | $this->apply(function(HtmlDoubleElement &$item){$item->setTagName("a");}); |
| 132 | - if($vertical===true) |
|
| 133 | - $this->setVertical(); |
|
| 132 | + if($vertical===true) { |
|
| 133 | + $this->setVertical(); |
|
| 134 | + } |
|
| 134 | 135 | return $this->addToProperty("class", "tabular"); |
| 135 | 136 | } |
| 136 | 137 | |
@@ -156,10 +157,11 @@ discard block |
||
| 156 | 157 | */ |
| 157 | 158 | public function fromDatabaseObject($object, $function) { |
| 158 | 159 | $return=$function($object); |
| 159 | - if(\is_array($return)) |
|
| 160 | - $this->addItems($return); |
|
| 161 | - else |
|
| 162 | - $this->addItem($return); |
|
| 160 | + if(\is_array($return)) { |
|
| 161 | + $this->addItems($return); |
|
| 162 | + } else { |
|
| 163 | + $this->addItem($return); |
|
| 164 | + } |
|
| 163 | 165 | } |
| 164 | 166 | |
| 165 | 167 | /** |
@@ -10,8 +10,9 @@ |
||
| 10 | 10 | |
| 11 | 11 | public function __construct($identifier,$context=NULL,$content=NULL) { |
| 12 | 12 | parent::__construct($identifier, "div", "ui sticky", $content); |
| 13 | - if(isset($content)) |
|
| 14 | - $this->setContext($context); |
|
| 13 | + if(isset($content)) { |
|
| 14 | + $this->setContext($context); |
|
| 15 | + } |
|
| 15 | 16 | } |
| 16 | 17 | |
| 17 | 18 | public function setContext($context){ |
@@ -49,8 +49,9 @@ discard block |
||
| 49 | 49 | public function addCol($width=NULL){ |
| 50 | 50 | $colCount=$this->colCount()+1; |
| 51 | 51 | $this->setColsCount($colCount,true,$width); |
| 52 | - if($this->hasOnlyCols($this->count())) |
|
| 53 | - return $this->content[$colCount-1]; |
|
| 52 | + if($this->hasOnlyCols($this->count())) { |
|
| 53 | + return $this->content[$colCount-1]; |
|
| 54 | + } |
|
| 54 | 55 | return $this; |
| 55 | 56 | } |
| 56 | 57 | |
@@ -73,7 +74,7 @@ discard block |
||
| 73 | 74 | for($i=$count;$i<$colsCount;$i++){ |
| 74 | 75 | $this->addItem(new HtmlGridCol("col-".$this->identifier."-".$i)); |
| 75 | 76 | } |
| 76 | - }else{ |
|
| 77 | + } else{ |
|
| 77 | 78 | if($this->hasOnlyCols($count)){ |
| 78 | 79 | $tmpContent=$this->content; |
| 79 | 80 | $item=$this->addItem($colsCount); |
@@ -93,15 +94,16 @@ discard block |
||
| 93 | 94 | } |
| 94 | 95 | |
| 95 | 96 | public function setColsCount($numCols,$toCreate=true,$width=NULL){ |
| 96 | - if(isset($width)===false) |
|
| 97 | - $this->setWide($numCols); |
|
| 97 | + if(isset($width)===false) { |
|
| 98 | + $this->setWide($numCols); |
|
| 99 | + } |
|
| 98 | 100 | if($toCreate==true){ |
| 99 | 101 | $count=$this->count(); |
| 100 | 102 | if($count==0 || $this->hasOnlyCols($count)){ |
| 101 | 103 | for($i=$count;$i<$numCols;$i++){ |
| 102 | 104 | $this->addItem(new HtmlGridCol("col-".$this->identifier."-".$i,$width)); |
| 103 | 105 | } |
| 104 | - }else{ |
|
| 106 | + } else{ |
|
| 105 | 107 | for($i=0;$i<$count;$i++){ |
| 106 | 108 | $this->getItem($i)->setColsCount($numCols); |
| 107 | 109 | } |
@@ -121,17 +123,20 @@ discard block |
||
| 121 | 123 | |
| 122 | 124 | public function rowCount(){ |
| 123 | 125 | $count=$this->count(); |
| 124 | - if($this->hasOnlyCols($count)) |
|
| 125 | - return 0; |
|
| 126 | + if($this->hasOnlyCols($count)) { |
|
| 127 | + return 0; |
|
| 128 | + } |
|
| 126 | 129 | return $count; |
| 127 | 130 | } |
| 128 | 131 | |
| 129 | 132 | public function colCount(){ |
| 130 | 133 | $count=$this->count(); |
| 131 | - if($this->hasOnlyCols($count)) |
|
| 132 | - return $count; |
|
| 133 | - if($count>0) |
|
| 134 | - return $this->getItem(0)->count(); |
|
| 134 | + if($this->hasOnlyCols($count)) { |
|
| 135 | + return $count; |
|
| 136 | + } |
|
| 137 | + if($count>0) { |
|
| 138 | + return $this->getItem(0)->count(); |
|
| 139 | + } |
|
| 135 | 140 | return 0; |
| 136 | 141 | } |
| 137 | 142 | |
@@ -141,8 +146,9 @@ discard block |
||
| 141 | 146 | * @return \Ajax\semantic\html\collections\HtmlGridCol |
| 142 | 147 | */ |
| 143 | 148 | public function getCell($row,$col){ |
| 144 | - if($row<2 && $this->hasOnlyCols($this->count())) |
|
| 145 | - return $this->getItem($col); |
|
| 149 | + if($row<2 && $this->hasOnlyCols($this->count())) { |
|
| 150 | + return $this->getItem($col); |
|
| 151 | + } |
|
| 146 | 152 | $row=$this->getItem($row); |
| 147 | 153 | if(isset($row)){ |
| 148 | 154 | $col=$row->getItem($col); |
@@ -191,8 +197,9 @@ discard block |
||
| 191 | 197 | * @return \Ajax\semantic\html\collections\HtmlGrid |
| 192 | 198 | */ |
| 193 | 199 | public function setPadded($value=NULL){ |
| 194 | - if(isset($value)) |
|
| 195 | - $this->addToPropertyCtrl("class", $value,array("vertically","horizontally")); |
|
| 200 | + if(isset($value)) { |
|
| 201 | + $this->addToPropertyCtrl("class", $value,array("vertically","horizontally")); |
|
| 202 | + } |
|
| 196 | 203 | return $this->addToProperty("class", "padded"); |
| 197 | 204 | } |
| 198 | 205 | |
@@ -214,8 +221,9 @@ discard block |
||
| 214 | 221 | * @see \Ajax\common\html\HtmlCollection::createItem() |
| 215 | 222 | */ |
| 216 | 223 | protected function createItem($value){ |
| 217 | - if($this->_createCols===false) |
|
| 218 | - $value=null; |
|
| 224 | + if($this->_createCols===false) { |
|
| 225 | + $value=null; |
|
| 226 | + } |
|
| 219 | 227 | $item=new HtmlGridRow($this->identifier."-row-".($this->count()+1),$value,$this->_colSizing,$this->_implicitRows); |
| 220 | 228 | return $item; |
| 221 | 229 | } |
@@ -14,9 +14,11 @@ |
||
| 14 | 14 | parent::__construct($identifier, $name,$label,$value,$type); |
| 15 | 15 | $this->_input->getField()->setProperty("type", "radio"); |
| 16 | 16 | $this->_input->setClass("ui radio checkbox"); |
| 17 | - if(isset($name)) |
|
| 18 | - $this->_input->getField()->setProperty("name", $name); |
|
| 19 | - if(isset($type)) |
|
| 20 | - $this->setType($type); |
|
| 17 | + if(isset($name)) { |
|
| 18 | + $this->_input->getField()->setProperty("name", $name); |
|
| 19 | + } |
|
| 20 | + if(isset($type)) { |
|
| 21 | + $this->setType($type); |
|
| 22 | + } |
|
| 21 | 23 | } |
| 22 | 24 | } |
| 23 | 25 | \ No newline at end of file |
@@ -12,7 +12,8 @@ |
||
| 12 | 12 | public function __construct($identifier, $label=NULL,$value=NULL,$type=NULL) { |
| 13 | 13 | parent::__construct($identifier, NULL,$label,$value,$type); |
| 14 | 14 | $this->_input->setClass("ui checkbox"); |
| 15 | - if(isset($type)) |
|
| 16 | - $this->setType($type); |
|
| 15 | + if(isset($type)) { |
|
| 16 | + $this->setType($type); |
|
| 17 | + } |
|
| 17 | 18 | } |
| 18 | 19 | } |
| 19 | 20 | \ No newline at end of file |
@@ -9,8 +9,9 @@ |
||
| 9 | 9 | use TextFieldsTrait; |
| 10 | 10 | |
| 11 | 11 | public function __construct($identifier, $label=NULL,$type="text",$value=NULL,$placeholder=NULL) { |
| 12 | - if(!isset($placeholder) && $type==="text") |
|
| 13 | - $placeholder=$label; |
|
| 12 | + if(!isset($placeholder) && $type==="text") { |
|
| 13 | + $placeholder=$label; |
|
| 14 | + } |
|
| 14 | 15 | parent::__construct("field-".$identifier, new HtmlInput($identifier,$type,$value,$placeholder), $label); |
| 15 | 16 | } |
| 16 | 17 | |