@@ -39,8 +39,9 @@ discard block |
||
| 39 | 39 | |
| 40 | 40 | public function getParam($key) { |
| 41 | 41 | $value=null; |
| 42 | - if (array_key_exists($key, $this->params)) |
|
| 43 | - $value=$this->params [$key]; |
|
| 42 | + if (array_key_exists($key, $this->params)) { |
|
| 43 | + $value=$this->params [$key]; |
|
| 44 | + } |
|
| 44 | 45 | return $value; |
| 45 | 46 | } |
| 46 | 47 | |
@@ -49,16 +50,18 @@ discard block |
||
| 49 | 50 | } |
| 50 | 51 | |
| 51 | 52 | public function compile(JsUtils $js=NULL) { |
| 52 | - if ($js==NULL) |
|
| 53 | - $js=$this->js; |
|
| 53 | + if ($js==NULL) { |
|
| 54 | + $js=$this->js; |
|
| 55 | + } |
|
| 54 | 56 | $script=$this->getScript(); |
| 55 | 57 | $js->addToCompile($script); |
| 56 | 58 | } |
| 57 | 59 | |
| 58 | 60 | protected function setParamCtrl($key, $value, $typeCtrl) { |
| 59 | 61 | if (\is_array($typeCtrl)) { |
| 60 | - if (array_search($value, $typeCtrl)===false) |
|
| 61 | - throw new \Exception("La valeur passée a propriété `".$key."` ne fait pas partie des valeurs possibles : {".implode(",", $typeCtrl)."}"); |
|
| 62 | + if (array_search($value, $typeCtrl)===false) { |
|
| 63 | + throw new \Exception("La valeur passée a propriété `".$key."` ne fait pas partie des valeurs possibles : {".implode(",", $typeCtrl)."}"); |
|
| 64 | + } |
|
| 62 | 65 | } else { |
| 63 | 66 | if (!$typeCtrl($value)) { |
| 64 | 67 | throw new \Exception("La fonction ".$typeCtrl." a retourné faux pour l'affectation de la propriété ".$key); |
@@ -70,9 +73,9 @@ discard block |
||
| 70 | 73 | public function setParams($params) { |
| 71 | 74 | foreach ( $params as $k => $v ) { |
| 72 | 75 | $method="set".ucfirst($k); |
| 73 | - if (method_exists($this, $method)) |
|
| 74 | - $this->$method($v); |
|
| 75 | - else { |
|
| 76 | + if (method_exists($this, $method)) { |
|
| 77 | + $this->$method($v); |
|
| 78 | + } else { |
|
| 76 | 79 | $this->setParam($k, $v); |
| 77 | 80 | trigger_error("`".$k."` property n'existe pas", E_USER_NOTICE); |
| 78 | 81 | } |
@@ -22,7 +22,7 @@ discard block |
||
| 22 | 22 | foreach ($items as $k=>$v){ |
| 23 | 23 | $this->addItem([$k,$v]); |
| 24 | 24 | } |
| 25 | - }else{ |
|
| 25 | + } else{ |
|
| 26 | 26 | foreach ($items as $item){ |
| 27 | 27 | $this->addItem($item); |
| 28 | 28 | } |
@@ -70,9 +70,9 @@ discard block |
||
| 70 | 70 | * @return \Ajax\common\html\HtmlDoubleElement |
| 71 | 71 | */ |
| 72 | 72 | public function getItem($index) { |
| 73 | - if (is_int($index)) |
|
| 74 | - return $this->content[$index]; |
|
| 75 | - else { |
|
| 73 | + if (is_int($index)) { |
|
| 74 | + return $this->content[$index]; |
|
| 75 | + } else { |
|
| 76 | 76 | $elm=$this->getElementById($index, $this->content); |
| 77 | 77 | return $elm; |
| 78 | 78 | } |
@@ -134,10 +134,11 @@ discard block |
||
| 134 | 134 | $i=0; |
| 135 | 135 | foreach ($properties as $k=>$v){ |
| 136 | 136 | $c=$this->content[$i++]; |
| 137 | - if(isset($c)) |
|
| 138 | - $c->setProperty($k,$v); |
|
| 139 | - else |
|
| 140 | - return $this; |
|
| 137 | + if(isset($c)) { |
|
| 138 | + $c->setProperty($k,$v); |
|
| 139 | + } else { |
|
| 140 | + return $this; |
|
| 141 | + } |
|
| 141 | 142 | } |
| 142 | 143 | return $this; |
| 143 | 144 | } |
@@ -151,8 +152,7 @@ discard block |
||
| 151 | 152 | $c=$this->content[$i++]; |
| 152 | 153 | if(isset($c)){ |
| 153 | 154 | $c->setProperty($property,$value); |
| 154 | - } |
|
| 155 | - else{ |
|
| 155 | + } else{ |
|
| 156 | 156 | return $this; |
| 157 | 157 | } |
| 158 | 158 | } |
@@ -12,18 +12,21 @@ |
||
| 12 | 12 | $this->setProperty("name", $identifier); |
| 13 | 13 | $this->setValue($value); |
| 14 | 14 | $this->setPlaceholder($placeholder); |
| 15 | - if(isset($rows)) |
|
| 16 | - $this->setRows($rows); |
|
| 15 | + if(isset($rows)) { |
|
| 16 | + $this->setRows($rows); |
|
| 17 | + } |
|
| 17 | 18 | } |
| 18 | 19 | public function setValue($value) { |
| 19 | - if(isset($value)) |
|
| 20 | - $this->setContent($value); |
|
| 20 | + if(isset($value)) { |
|
| 21 | + $this->setContent($value); |
|
| 22 | + } |
|
| 21 | 23 | return $this; |
| 22 | 24 | } |
| 23 | 25 | |
| 24 | 26 | public function setPlaceholder($value){ |
| 25 | - if(JString::isNotNull($value)) |
|
| 26 | - $this->setProperty("placeholder", $value); |
|
| 27 | + if(JString::isNotNull($value)) { |
|
| 28 | + $this->setProperty("placeholder", $value); |
|
| 29 | + } |
|
| 27 | 30 | return $this; |
| 28 | 31 | } |
| 29 | 32 | |
@@ -32,8 +32,9 @@ discard block |
||
| 32 | 32 | // } |
| 33 | 33 | $this->setWide($numCols); |
| 34 | 34 | } |
| 35 | - if($createCols) |
|
| 36 | - $this->setRowsCount($numRows, $numCols); |
|
| 35 | + if($createCols) { |
|
| 36 | + $this->setRowsCount($numRows, $numCols); |
|
| 37 | + } |
|
| 37 | 38 | } |
| 38 | 39 | |
| 39 | 40 | public function asSegment() { |
@@ -85,8 +86,9 @@ discard block |
||
| 85 | 86 | public function addCol($width=NULL) { |
| 86 | 87 | $colCount=$this->colCount() + 1; |
| 87 | 88 | $this->setColsCount($colCount, true, $width); |
| 88 | - if ($this->hasOnlyCols($this->count())) |
|
| 89 | - return $this->content[$colCount - 1]; |
|
| 89 | + if ($this->hasOnlyCols($this->count())) { |
|
| 90 | + return $this->content[$colCount - 1]; |
|
| 91 | + } |
|
| 90 | 92 | return $this; |
| 91 | 93 | } |
| 92 | 94 | |
@@ -174,8 +176,9 @@ discard block |
||
| 174 | 176 | */ |
| 175 | 177 | public function rowCount() { |
| 176 | 178 | $count=$this->count(); |
| 177 | - if ($this->hasOnlyCols($count)) |
|
| 178 | - return 0; |
|
| 179 | + if ($this->hasOnlyCols($count)) { |
|
| 180 | + return 0; |
|
| 181 | + } |
|
| 179 | 182 | return $count; |
| 180 | 183 | } |
| 181 | 184 | |
@@ -185,10 +188,12 @@ discard block |
||
| 185 | 188 | */ |
| 186 | 189 | public function colCount() { |
| 187 | 190 | $count=$this->count(); |
| 188 | - if ($this->hasOnlyCols($count)) |
|
| 189 | - return $count; |
|
| 190 | - if ($count > 0) |
|
| 191 | - return $this->getItem(0)->count(); |
|
| 191 | + if ($this->hasOnlyCols($count)) { |
|
| 192 | + return $count; |
|
| 193 | + } |
|
| 194 | + if ($count > 0) { |
|
| 195 | + return $this->getItem(0)->count(); |
|
| 196 | + } |
|
| 192 | 197 | return 0; |
| 193 | 198 | } |
| 194 | 199 | |
@@ -199,8 +204,9 @@ discard block |
||
| 199 | 204 | * @return \Ajax\semantic\html\collections\HtmlGridCol |
| 200 | 205 | */ |
| 201 | 206 | public function getCell($row, $col) { |
| 202 | - if ($row < 2 && $this->hasOnlyCols($this->count())) |
|
| 203 | - return $this->getItem($col); |
|
| 207 | + if ($row < 2 && $this->hasOnlyCols($this->count())) { |
|
| 208 | + return $this->getItem($col); |
|
| 209 | + } |
|
| 204 | 210 | $row=$this->getItem($row); |
| 205 | 211 | if (isset($row)) { |
| 206 | 212 | $col=$row->getItem($col); |
@@ -249,8 +255,9 @@ discard block |
||
| 249 | 255 | * @return \Ajax\semantic\html\collections\HtmlGrid |
| 250 | 256 | */ |
| 251 | 257 | public function setPadded($value=NULL) { |
| 252 | - if (isset($value)) |
|
| 253 | - $this->addToPropertyCtrl("class", $value, array ("vertically","horizontally" )); |
|
| 258 | + if (isset($value)) { |
|
| 259 | + $this->addToPropertyCtrl("class", $value, array ("vertically","horizontally" )); |
|
| 260 | + } |
|
| 254 | 261 | return $this->addToProperty("class", "padded"); |
| 255 | 262 | } |
| 256 | 263 | |
@@ -275,8 +282,9 @@ discard block |
||
| 275 | 282 | * @see \Ajax\common\html\HtmlCollection::createItem() |
| 276 | 283 | */ |
| 277 | 284 | protected function createItem($value) { |
| 278 | - if ($this->_createCols === false) |
|
| 279 | - $value=null; |
|
| 285 | + if ($this->_createCols === false) { |
|
| 286 | + $value=null; |
|
| 287 | + } |
|
| 280 | 288 | $item=new HtmlGridRow($this->identifier . "-row-" . ($this->count() + 1), $value, $this->_colSizing, $this->_implicitRows); |
| 281 | 289 | return $item; |
| 282 | 290 | } |
@@ -29,15 +29,17 @@ discard block |
||
| 29 | 29 | |
| 30 | 30 | public function addContent($content,$before=false) { |
| 31 | 31 | if (!\is_array($this->content)) { |
| 32 | - if(isset($this->content)) |
|
| 33 | - $this->content=array ($this->content); |
|
| 34 | - else |
|
| 35 | - $this->content=array(); |
|
| 32 | + if(isset($this->content)) { |
|
| 33 | + $this->content=array ($this->content); |
|
| 34 | + } else { |
|
| 35 | + $this->content=array(); |
|
| 36 | + } |
|
| 37 | + } |
|
| 38 | + if($before) { |
|
| 39 | + array_unshift($this->content,$content); |
|
| 40 | + } else { |
|
| 41 | + $this->content []=$content; |
|
| 36 | 42 | } |
| 37 | - if($before) |
|
| 38 | - array_unshift($this->content,$content); |
|
| 39 | - else |
|
| 40 | - $this->content []=$content; |
|
| 41 | 43 | return $this; |
| 42 | 44 | } |
| 43 | 45 | |
@@ -75,9 +77,9 @@ discard block |
||
| 75 | 77 | $instances=[]; |
| 76 | 78 | if($content instanceof $class){ |
| 77 | 79 | $instances[]=$content; |
| 78 | - }elseif($content instanceof HtmlDoubleElement){ |
|
| 80 | + } elseif($content instanceof HtmlDoubleElement){ |
|
| 79 | 81 | $instances=\array_merge($instances,$content->getContentInstances($class)); |
| 80 | - }elseif (\is_array($content)){ |
|
| 82 | + } elseif (\is_array($content)){ |
|
| 81 | 83 | foreach ($content as $element){ |
| 82 | 84 | $instances=\array_merge($instances,$this->_getContentInstances($class, $element)); |
| 83 | 85 | } |
@@ -17,8 +17,9 @@ discard block |
||
| 17 | 17 | } |
| 18 | 18 | |
| 19 | 19 | public function setValue($value) { |
| 20 | - if(isset($value)) |
|
| 21 | - $this->setProperty("value", $value); |
|
| 20 | + if(isset($value)) { |
|
| 21 | + $this->setProperty("value", $value); |
|
| 22 | + } |
|
| 22 | 23 | return $this; |
| 23 | 24 | } |
| 24 | 25 | |
@@ -27,16 +28,18 @@ discard block |
||
| 27 | 28 | } |
| 28 | 29 | |
| 29 | 30 | public function setPlaceholder($value){ |
| 30 | - if(JString::isNotNull($value)) |
|
| 31 | - $this->_placeholder=$value; |
|
| 31 | + if(JString::isNotNull($value)) { |
|
| 32 | + $this->_placeholder=$value; |
|
| 33 | + } |
|
| 32 | 34 | return $this; |
| 33 | 35 | } |
| 34 | 36 | |
| 35 | 37 | public function compile(JsUtils $js=NULL,&$view=NULL){ |
| 36 | 38 | $value=$this->_placeholder; |
| 37 | 39 | if(JString::isNull($value)){ |
| 38 | - if(JString::isNotNull($this->getProperty("name"))) |
|
| 39 | - $value=\ucfirst($this->getProperty("name")); |
|
| 40 | + if(JString::isNotNull($this->getProperty("name"))) { |
|
| 41 | + $value=\ucfirst($this->getProperty("name")); |
|
| 42 | + } |
|
| 40 | 43 | } |
| 41 | 44 | $this->setProperty("placeholder", $value); |
| 42 | 45 | return parent::compile($js,$view); |
@@ -186,8 +186,9 @@ discard block |
||
| 186 | 186 | */ |
| 187 | 187 | public function addItemInToolbar($caption,$icon=NULL,$callback=NULL){ |
| 188 | 188 | $result=$this->addInToolbar($caption,$callback); |
| 189 | - if(isset($icon)) |
|
| 190 | - $result->addIcon($icon); |
|
| 189 | + if(isset($icon)) { |
|
| 190 | + $result->addIcon($icon); |
|
| 191 | + } |
|
| 191 | 192 | return $result; |
| 192 | 193 | } |
| 193 | 194 | |
@@ -201,7 +202,7 @@ discard block |
||
| 201 | 202 | foreach ($items as $icon=>$item){ |
| 202 | 203 | $this->addItemInToolbar($item,$icon,$callback); |
| 203 | 204 | } |
| 204 | - }else{ |
|
| 205 | + } else{ |
|
| 205 | 206 | foreach ($items as $item){ |
| 206 | 207 | $this->addItemInToolbar($item,null,$callback); |
| 207 | 208 | } |
@@ -352,8 +353,9 @@ discard block |
||
| 352 | 353 | protected function _compileForm(){ |
| 353 | 354 | if(isset($this->_form)){ |
| 354 | 355 | $noValidate=""; |
| 355 | - if(\sizeof($this->_form->getValidationParams())>0) |
|
| 356 | - $noValidate="novalidate"; |
|
| 356 | + if(\sizeof($this->_form->getValidationParams())>0) { |
|
| 357 | + $noValidate="novalidate"; |
|
| 358 | + } |
|
| 357 | 359 | $this->wrapContent("<form class='ui form' id='frm-".$this->identifier."' name='frm-".$this->identifier."' ".$noValidate.">","</form>"); |
| 358 | 360 | } |
| 359 | 361 | } |
@@ -49,8 +49,9 @@ discard block |
||
| 49 | 49 | } |
| 50 | 50 | |
| 51 | 51 | public function setStyle($value) { |
| 52 | - foreach ( $this->elements as $element ) |
|
| 53 | - $element->setStyle($value); |
|
| 52 | + foreach ( $this->elements as $element ) { |
|
| 53 | + $element->setStyle($value); |
|
| 54 | + } |
|
| 54 | 55 | } |
| 55 | 56 | |
| 56 | 57 | private function dropdownAsButton($bt) { |
@@ -76,18 +77,19 @@ discard block |
||
| 76 | 77 | } elseif (is_string($element)) { |
| 77 | 78 | $result=new HtmlButton($this->identifier."-button-".$iid,$element); |
| 78 | 79 | } |
| 79 | - if($result instanceof HtmlButton) |
|
| 80 | - $this->elements[]=$result; |
|
| 80 | + if($result instanceof HtmlButton) { |
|
| 81 | + $this->elements[]=$result; |
|
| 82 | + } |
|
| 81 | 83 | return $result; |
| 82 | 84 | } |
| 83 | 85 | |
| 84 | 86 | private function _addArrayElement(array $element,$iid){ |
| 85 | - if (array_key_exists("glyph", $element)) |
|
| 86 | - $bt=new HtmlGlyphButton($this->identifier."-button-".$iid); |
|
| 87 | - elseif (array_key_exists("btnCaption", $element)) { |
|
| 88 | - if (array_key_exists("split", $element)) |
|
| 89 | - $bt=new HtmlSplitbutton($this->identifier."-dropdown-".$iid); |
|
| 90 | - else{ |
|
| 87 | + if (array_key_exists("glyph", $element)) { |
|
| 88 | + $bt=new HtmlGlyphButton($this->identifier."-button-".$iid); |
|
| 89 | + } elseif (array_key_exists("btnCaption", $element)) { |
|
| 90 | + if (array_key_exists("split", $element)) { |
|
| 91 | + $bt=new HtmlSplitbutton($this->identifier."-dropdown-".$iid); |
|
| 92 | + } else{ |
|
| 91 | 93 | $bt=new HtmlDropdown($this->identifier."-dropdown-".$iid); |
| 92 | 94 | $this->dropdownAsButton($bt); |
| 93 | 95 | } |
@@ -116,8 +118,9 @@ discard block |
||
| 116 | 118 | public function setAlignment($value) { |
| 117 | 119 | if (is_int($value)) { |
| 118 | 120 | $value=CssRef::alignment("btn-group")[$value]; |
| 119 | - } else |
|
| 120 | - $value="btn-group-".$value; |
|
| 121 | + } else { |
|
| 122 | + $value="btn-group-".$value; |
|
| 123 | + } |
|
| 121 | 124 | if (strstr($value, "justified")) { |
| 122 | 125 | foreach ( $this->elements as $element ) { |
| 123 | 126 | $element->wrap('<div class="btn-group" role="group">', '</div>'); |
@@ -132,9 +135,9 @@ discard block |
||
| 132 | 135 | * @return HtmlButton |
| 133 | 136 | */ |
| 134 | 137 | public function getElement($index) { |
| 135 | - if (is_int($index)) |
|
| 136 | - return $this->elements[$index]; |
|
| 137 | - else { |
|
| 138 | + if (is_int($index)) { |
|
| 139 | + return $this->elements[$index]; |
|
| 140 | + } else { |
|
| 138 | 141 | $elm=$this->getElementById($index, $this->elements); |
| 139 | 142 | return $elm; |
| 140 | 143 | } |
@@ -47,15 +47,17 @@ |
||
| 47 | 47 | |
| 48 | 48 | |
| 49 | 49 | public function addSeparatorAfter($fieldNum){ |
| 50 | - if(\array_search($fieldNum, $this->separators)===false) |
|
| 51 | - $this->separators[]=$fieldNum; |
|
| 50 | + if(\array_search($fieldNum, $this->separators)===false) { |
|
| 51 | + $this->separators[]=$fieldNum; |
|
| 52 | + } |
|
| 52 | 53 | return $this; |
| 53 | 54 | } |
| 54 | 55 | |
| 55 | 56 | public function addHeaderDividerBefore($fieldNum,$header){ |
| 56 | 57 | $this->headers[$fieldNum]=$header; |
| 57 | - if($fieldNum>0) |
|
| 58 | - $this->addSeparatorAfter($fieldNum-1); |
|
| 58 | + if($fieldNum>0) { |
|
| 59 | + $this->addSeparatorAfter($fieldNum-1); |
|
| 60 | + } |
|
| 59 | 61 | return $this; |
| 60 | 62 | } |
| 61 | 63 | |