@@ -26,9 +26,9 @@ discard block |
||
26 | 26 | $itemSelector=JString::getValueBetween($event); |
27 | 27 | if($event=="execute"){ |
28 | 28 | $this->jquery_code_for_compile []=$jsCode; |
29 | - }else if($event=="beforeExecute"){ |
|
29 | + } else if($event=="beforeExecute"){ |
|
30 | 30 | \array_unshift($this->jquery_code_for_compile, $jsCode); |
31 | - }else{ |
|
31 | + } else{ |
|
32 | 32 | $selector=$this->_createSelector($itemSelector, $this->attachTo); |
33 | 33 | $this->jquery_code_for_compile []="$( \"".$selector."\" ).on(\"".$event."\" , function( event, data ) {".$jsCode."});"; |
34 | 34 | } |
@@ -36,10 +36,12 @@ discard block |
||
36 | 36 | } |
37 | 37 | |
38 | 38 | protected function _createSelector($itemSelector,$selector){ |
39 | - if(!isset($itemSelector)) |
|
40 | - $itemSelector=$this->itemSelector; |
|
41 | - if(isset($itemSelector) && $itemSelector!=="") |
|
42 | - $selector.=" ".$itemSelector; |
|
39 | + if(!isset($itemSelector)) { |
|
40 | + $itemSelector=$this->itemSelector; |
|
41 | + } |
|
42 | + if(isset($itemSelector) && $itemSelector!=="") { |
|
43 | + $selector.=" ".$itemSelector; |
|
44 | + } |
|
43 | 45 | return $selector; |
44 | 46 | } |
45 | 47 | |
@@ -82,8 +84,9 @@ discard block |
||
82 | 84 | |
83 | 85 | protected function setParamCtrl($key, $value, $typeCtrl) { |
84 | 86 | if (\is_array($typeCtrl)) { |
85 | - if (array_search($value, $typeCtrl)===false) |
|
86 | - throw new \Exception("La valeur passée a propriété `".$key."` pour le composant `".$this->uiName."` ne fait pas partie des valeurs possibles : {".implode(",", $typeCtrl)."}"); |
|
87 | + if (array_search($value, $typeCtrl)===false) { |
|
88 | + throw new \Exception("La valeur passée a propriété `".$key."` pour le composant `".$this->uiName."` ne fait pas partie des valeurs possibles : {".implode(",", $typeCtrl)."}"); |
|
89 | + } |
|
87 | 90 | } else { |
88 | 91 | if (!$typeCtrl($value)) { |
89 | 92 | throw new \Exception("La fonction ".$typeCtrl." a retourné faux pour l'affectation de la propriété ".$key." au composant ".$this->uiName); |
@@ -9,16 +9,18 @@ |
||
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 | $this->_identifier=$identifier; |
16 | 17 | } |
17 | 18 | |
18 | 19 | public function getDataField(){ |
19 | 20 | $field= $this->getField(); |
20 | - if($field instanceof HtmlInput) |
|
21 | - $field=$field->getDataField(); |
|
21 | + if($field instanceof HtmlInput) { |
|
22 | + $field=$field->getDataField(); |
|
23 | + } |
|
22 | 24 | return $field; |
23 | 25 | } |
24 | 26 | } |
@@ -22,10 +22,12 @@ |
||
22 | 22 | |
23 | 23 | private function createField($placeholder=NULL, $icon=NULL) { |
24 | 24 | $field=new HtmlInput($this->identifier); |
25 | - if (isset($placeholder)) |
|
26 | - $field->setPlaceholder($placeholder); |
|
27 | - if (isset($icon)) |
|
28 | - $field->addIcon($icon, Direction::RIGHT); |
|
25 | + if (isset($placeholder)) { |
|
26 | + $field->setPlaceholder($placeholder); |
|
27 | + } |
|
28 | + if (isset($icon)) { |
|
29 | + $field->addIcon($icon, Direction::RIGHT); |
|
30 | + } |
|
29 | 31 | $field->getDataField()->setClass("prompt"); |
30 | 32 | $this->content["field"]=$field; |
31 | 33 | return $field; |
@@ -48,8 +48,9 @@ discard block |
||
48 | 48 | |
49 | 49 | public function setVariations($variations) { |
50 | 50 | $this->_self->setProperty("class", $this->_self->getBaseClass()); |
51 | - if (\is_string($variations)) |
|
52 | - $variations=\explode(" ", $variations); |
|
51 | + if (\is_string($variations)) { |
|
52 | + $variations=\explode(" ", $variations); |
|
53 | + } |
|
53 | 54 | foreach ( $variations as $variation ) { |
54 | 55 | $this->_self->addVariation($variation); |
55 | 56 | } |
@@ -62,8 +63,9 @@ discard block |
||
62 | 63 | } |
63 | 64 | |
64 | 65 | public function addVariations($variations=array()) { |
65 | - if (\is_string($variations)) |
|
66 | - $variations=\explode(" ", $variations); |
|
66 | + if (\is_string($variations)) { |
|
67 | + $variations=\explode(" ", $variations); |
|
68 | + } |
|
67 | 69 | foreach ( $variations as $variation ) { |
68 | 70 | $this->_self->addVariation($variation); |
69 | 71 | } |
@@ -71,8 +73,9 @@ discard block |
||
71 | 73 | } |
72 | 74 | |
73 | 75 | public function addStates($states=array()) { |
74 | - if (\is_string($states)) |
|
75 | - $states=\explode(" ", $states); |
|
76 | + if (\is_string($states)) { |
|
77 | + $states=\explode(" ", $states); |
|
78 | + } |
|
76 | 79 | foreach ( $states as $state ) { |
77 | 80 | $this->_self->addState($state); |
78 | 81 | } |
@@ -81,8 +84,9 @@ discard block |
||
81 | 84 | |
82 | 85 | public function setStates($states) { |
83 | 86 | $this->_self->setProperty("class", $this->_self->getBaseClass()); |
84 | - if (\is_string($states)) |
|
85 | - $states=\explode(" ", $states); |
|
87 | + if (\is_string($states)) { |
|
88 | + $states=\explode(" ", $states); |
|
89 | + } |
|
86 | 90 | foreach ( $states as $state ) { |
87 | 91 | $this->_self->addState($state); |
88 | 92 | } |
@@ -114,8 +118,9 @@ discard block |
||
114 | 118 | * @return HtmlSemDoubleElement |
115 | 119 | */ |
116 | 120 | public function setDisabled($disable=true) { |
117 | - if($disable) |
|
118 | - $this->_self->addToProperty("class", "disabled"); |
|
121 | + if($disable) { |
|
122 | + $this->_self->addToProperty("class", "disabled"); |
|
123 | + } |
|
119 | 124 | return $this; |
120 | 125 | } |
121 | 126 | |
@@ -149,14 +154,16 @@ discard block |
||
149 | 154 | * @return HtmlSemDoubleElement |
150 | 155 | */ |
151 | 156 | public function setActive($value=true){ |
152 | - if($value) |
|
153 | - $this->_self->addToProperty("class", "active"); |
|
157 | + if($value) { |
|
158 | + $this->_self->addToProperty("class", "active"); |
|
159 | + } |
|
154 | 160 | return $this; |
155 | 161 | } |
156 | 162 | |
157 | 163 | public function setAttached($value=true){ |
158 | - if($value) |
|
159 | - $this->_self->addToPropertyCtrl("class", "attached", array ("attached" )); |
|
164 | + if($value) { |
|
165 | + $this->_self->addToPropertyCtrl("class", "attached", array ("attached" )); |
|
166 | + } |
|
160 | 167 | return $this; |
161 | 168 | } |
162 | 169 | |
@@ -166,9 +173,9 @@ discard block |
||
166 | 173 | public function setInverted($recursive=true) { |
167 | 174 | if($recursive===true){ |
168 | 175 | $content=$this->_self->getContent(); |
169 | - if($content instanceof HtmlSemDoubleElement) |
|
170 | - $content->setInverted($recursive); |
|
171 | - elseif(\is_array($content) || $content instanceof \Traversable){ |
|
176 | + if($content instanceof HtmlSemDoubleElement) { |
|
177 | + $content->setInverted($recursive); |
|
178 | + } elseif(\is_array($content) || $content instanceof \Traversable){ |
|
172 | 179 | foreach ($content as $elm){ |
173 | 180 | if($elm instanceof HtmlSemDoubleElement){ |
174 | 181 | $elm->setInverted($recursive); |
@@ -204,9 +211,10 @@ discard block |
||
204 | 211 | if(isset($array[$key])){ |
205 | 212 | $p=JString::replaceAtFirstAndLast($array[$key], $before, "", $after, ""); |
206 | 213 | $array[$key]=$before.$p.$value.$after; |
207 | - }else |
|
208 | - $array[$key]=$before.$value.$after; |
|
209 | - }else{ |
|
214 | + } else { |
|
215 | + $array[$key]=$before.$value.$after; |
|
216 | + } |
|
217 | + } else{ |
|
210 | 218 | $array[$key]=$value; |
211 | 219 | } |
212 | 220 | return $this; |
@@ -22,8 +22,9 @@ discard block |
||
22 | 22 | */ |
23 | 23 | public function __construct($identifier, $tagName="tbody", $rowCount=NULL, $colCount=NULL) { |
24 | 24 | parent::__construct($identifier, $tagName, ""); |
25 | - if (isset($rowCount) && isset($colCount)) |
|
26 | - $this->setRowCount($rowCount, $colCount); |
|
25 | + if (isset($rowCount) && isset($colCount)) { |
|
26 | + $this->setRowCount($rowCount, $colCount); |
|
27 | + } |
|
27 | 28 | } |
28 | 29 | |
29 | 30 | /** |
@@ -148,8 +149,9 @@ discard block |
||
148 | 149 | $values=\array_fill(0, $count, $values); |
149 | 150 | $isArray=false; |
150 | 151 | } |
151 | - if (JArray::dimension($values) == 1 && $isArray) |
|
152 | - $values=[ $values ]; |
|
152 | + if (JArray::dimension($values) == 1 && $isArray) { |
|
153 | + $values=[ $values ]; |
|
154 | + } |
|
153 | 155 | |
154 | 156 | $count=\min(\sizeof($values), $count); |
155 | 157 | |
@@ -193,8 +195,9 @@ discard block |
||
193 | 195 | $count=$this->count(); |
194 | 196 | for($i=0; $i < $count; $i++) { |
195 | 197 | $index=$this->content[$i]->getColPosition($colIndex); |
196 | - if ($index !== NULL) |
|
197 | - $this->getCell($i, $index)->$function(); |
|
198 | + if ($index !== NULL) { |
|
199 | + $this->getCell($i, $index)->$function(); |
|
200 | + } |
|
198 | 201 | } |
199 | 202 | return $this; |
200 | 203 | } |
@@ -225,8 +228,9 @@ discard block |
||
225 | 228 | */ |
226 | 229 | public function getColCount() { |
227 | 230 | $result=0; |
228 | - if ($this->count() > 0) |
|
229 | - $result=$this->getItem(0)->count(); |
|
231 | + if ($this->count() > 0) { |
|
232 | + $result=$this->getItem(0)->count(); |
|
233 | + } |
|
230 | 234 | return $result; |
231 | 235 | } |
232 | 236 | |
@@ -250,8 +254,9 @@ discard block |
||
250 | 254 | |
251 | 255 | public function toDelete($rowIndex, $colIndex){ |
252 | 256 | $row=$this->getItem($rowIndex); |
253 | - if (isset($row) === true) |
|
254 | - $row->toDelete($colIndex); |
|
257 | + if (isset($row) === true) { |
|
258 | + $row->toDelete($colIndex); |
|
259 | + } |
|
255 | 260 | return $this; |
256 | 261 | } |
257 | 262 | |
@@ -349,8 +354,9 @@ discard block |
||
349 | 354 | foreach ( $rows as $row ) { |
350 | 355 | $cell=$row->getItem($colIndex); |
351 | 356 | $value=$cell->getContent(); |
352 | - if($functionExists) |
|
353 | - $value=\call_user_func($function,$value); |
|
357 | + if($functionExists) { |
|
358 | + $value=\call_user_func($function,$value); |
|
359 | + } |
|
354 | 360 | if($value!==$identiqual){ |
355 | 361 | if($counter>0 && isset($cellToMerge)){ |
356 | 362 | $cellToMerge->setRowspan($counter); |
@@ -55,9 +55,9 @@ discard block |
||
55 | 55 | } |
56 | 56 | |
57 | 57 | public function setFocusable($value=true) { |
58 | - if ($value === true) |
|
59 | - $this->setProperty("tabindex", "0"); |
|
60 | - else { |
|
58 | + if ($value === true) { |
|
59 | + $this->setProperty("tabindex", "0"); |
|
60 | + } else { |
|
61 | 61 | $this->removeProperty("tabindex"); |
62 | 62 | } |
63 | 63 | return $this; |
@@ -105,8 +105,9 @@ discard block |
||
105 | 105 | */ |
106 | 106 | public function addLabel($label, $before=false, $icon=NULL) { |
107 | 107 | $this->tagName="div";$prefix=""; |
108 | - if($before) |
|
109 | - $prefix="left "; |
|
108 | + if($before) { |
|
109 | + $prefix="left "; |
|
110 | + } |
|
110 | 111 | $this->addToProperty("class", $prefix."labeled"); |
111 | 112 | $isIcon=(isset($this->content[0]) && $this->content[0] instanceof HtmlIcon); |
112 | 113 | $this->content=new HtmlButton("button-" . $this->identifier, $this->content); |
@@ -143,12 +144,13 @@ discard block |
||
143 | 144 | public function setColor($color){ |
144 | 145 | if(\is_array($this->content)){ |
145 | 146 | foreach ($this->content as $content){ |
146 | - if($content instanceof HtmlButton) |
|
147 | - $content->setColor($color); |
|
147 | + if($content instanceof HtmlButton) { |
|
148 | + $content->setColor($color); |
|
149 | + } |
|
148 | 150 | } |
151 | + } else { |
|
152 | + parent::setColor($color); |
|
149 | 153 | } |
150 | - else |
|
151 | - parent::setColor($color); |
|
152 | 154 | return $this; |
153 | 155 | } |
154 | 156 | |
@@ -201,8 +203,9 @@ discard block |
||
201 | 203 | * @return HtmlButton |
202 | 204 | */ |
203 | 205 | public static function social($identifier, $social, $value=NULL) { |
204 | - if ($value === NULL) |
|
205 | - $value=\ucfirst($social); |
|
206 | + if ($value === NULL) { |
|
207 | + $value=\ucfirst($social); |
|
208 | + } |
|
206 | 209 | $return=new HtmlButton($identifier, $value); |
207 | 210 | $return->addIcon($social); |
208 | 211 | return $return->addToPropertyCtrl("class", $social, Social::getConstants()); |
@@ -255,8 +258,9 @@ discard block |
||
255 | 258 | public static function dropdown($identifier,$value,$items=[],$asCombo=false,$icon=null){ |
256 | 259 | $result=new HtmlButtonGroups($identifier,[$value]); |
257 | 260 | $result->addDropdown($items,$asCombo); |
258 | - if(isset($icon)) |
|
259 | - $result->setIcon($icon); |
|
261 | + if(isset($icon)) { |
|
262 | + $result->setIcon($icon); |
|
263 | + } |
|
260 | 264 | return $result; |
261 | 265 | } |
262 | 266 | } |
@@ -24,8 +24,9 @@ discard block |
||
24 | 24 | } |
25 | 25 | |
26 | 26 | public function removeIcon(){ |
27 | - if(isset($this->content["icon"])) |
|
28 | - unset($this->content["icon"]); |
|
27 | + if(isset($this->content["icon"])) { |
|
28 | + unset($this->content["icon"]); |
|
29 | + } |
|
29 | 30 | return $this; |
30 | 31 | } |
31 | 32 | |
@@ -63,7 +64,7 @@ discard block |
||
63 | 64 | $this->setTagName("div"); |
64 | 65 | $this->removeProperty("href"); |
65 | 66 | $this->addToPropertyCtrl("class", "active", array("active")); |
66 | - }else{ |
|
67 | + } else{ |
|
67 | 68 | $this->removePropertyValue("class", "active"); |
68 | 69 | } |
69 | 70 | return $this; |
@@ -71,8 +72,9 @@ discard block |
||
71 | 72 | |
72 | 73 | public function asLink($href=NULL,$part=NULL){ |
73 | 74 | $this->setTagName("a"); |
74 | - if(isset($href)) |
|
75 | - $this->setProperty("href", $href); |
|
75 | + if(isset($href)) { |
|
76 | + $this->setProperty("href", $href); |
|
77 | + } |
|
76 | 78 | return $this; |
77 | 79 | } |
78 | 80 | |
@@ -83,8 +85,9 @@ discard block |
||
83 | 85 | * @see \Ajax\semantic\html\base\HtmlSemDoubleElement::compile() |
84 | 86 | */ |
85 | 87 | public function compile(JsUtils $js=NULL, &$view=NULL) { |
86 | - if(\is_array($this->content) && JArray::isAssociative($this->content)) |
|
87 | - $this->content=JArray::sortAssociative($this->content, [ "icon","image","content" ]); |
|
88 | + if(\is_array($this->content) && JArray::isAssociative($this->content)) { |
|
89 | + $this->content=JArray::sortAssociative($this->content, [ "icon","image","content" ]); |
|
90 | + } |
|
88 | 91 | return parent::compile($js, $view); |
89 | 92 | } |
90 | 93 | } |
@@ -55,26 +55,29 @@ |
||
55 | 55 | for($i=$this->_startStep;$i<$count;$i++){ |
56 | 56 | $step=$this->content[$i]; |
57 | 57 | $step->removeStatus(); |
58 | - if($i<$activestep) |
|
59 | - $step->setCompleted(); |
|
60 | - elseif ($i===$activestep) |
|
61 | - $step->setActive(); |
|
62 | - else |
|
63 | - $step->setDisabled(); |
|
58 | + if($i<$activestep) { |
|
59 | + $step->setCompleted(); |
|
60 | + } elseif ($i===$activestep) { |
|
61 | + $step->setActive(); |
|
62 | + } else { |
|
63 | + $step->setDisabled(); |
|
64 | + } |
|
64 | 65 | } |
65 | - }else{ |
|
66 | + } else{ |
|
66 | 67 | foreach ($this->content as $step){ |
67 | 68 | $step->removeStatus(); |
68 | 69 | } |
69 | - if($activestep<$count) |
|
70 | - $this->content[$activestep]->setActive(); |
|
70 | + if($activestep<$count) { |
|
71 | + $this->content[$activestep]->setActive(); |
|
72 | + } |
|
71 | 73 | } |
72 | 74 | return $this; |
73 | 75 | } |
74 | 76 | |
75 | 77 | public function compile(JsUtils $js=NULL, &$view=NULL) { |
76 | - if(isset($this->_activeStep) && \is_numeric($this->_activeStep)) |
|
77 | - $this->defineActiveStep(); |
|
78 | + if(isset($this->_activeStep) && \is_numeric($this->_activeStep)) { |
|
79 | + $this->defineActiveStep(); |
|
80 | + } |
|
78 | 81 | return parent::compile($js,$view); |
79 | 82 | } |
80 | 83 |
@@ -17,7 +17,7 @@ discard block |
||
17 | 17 | $icon=@$content[0]; |
18 | 18 | $title=@$content[1]; |
19 | 19 | $desc=@$content[2]; |
20 | - }else{ |
|
20 | + } else{ |
|
21 | 21 | $icon=@$content["icon"]; |
22 | 22 | $image=@$content["image"]; |
23 | 23 | $title=@$content["title"]; |
@@ -33,20 +33,21 @@ discard block |
||
33 | 33 | } |
34 | 34 | if(isset($title)){ |
35 | 35 | $this->setTitle($title,$desc); |
36 | - }elseif (isset($header)){ |
|
36 | + } elseif (isset($header)){ |
|
37 | 37 | $this->setTitle($header,$desc,"header"); |
38 | 38 | } |
39 | 39 | if(isset($items)){ |
40 | 40 | $this->addList($items); |
41 | 41 | } |
42 | - }else{ |
|
42 | + } else{ |
|
43 | 43 | $this->setContent($content); |
44 | 44 | } |
45 | 45 | } |
46 | 46 | public function addList($items=array(),$ordered=false) { |
47 | 47 | $list=new HtmlList("", $items); |
48 | - if($ordered) |
|
49 | - $list->setOrdered(); |
|
48 | + if($ordered) { |
|
49 | + $list->setOrdered(); |
|
50 | + } |
|
50 | 51 | $list->setClass("list"); |
51 | 52 | $this->content["list"]=$list; |
52 | 53 | return $list; |