@@ -24,10 +24,12 @@ discard block |
||
24 | 24 | if (isset($value)) { |
25 | 25 | $value=Javascript::prep_value($value); |
26 | 26 | $str="$({$element}).attr(\"$attributeName\",{$value});"; |
27 | - } else |
|
28 | - $str="$({$element}).attr(\"$attributeName\");"; |
|
29 | - if ($immediatly) |
|
30 | - $this->jquery_code_for_compile[]=$str; |
|
27 | + } else { |
|
28 | + $str="$({$element}).attr(\"$attributeName\");"; |
|
29 | + } |
|
30 | + if ($immediatly) { |
|
31 | + $this->jquery_code_for_compile[]=$str; |
|
32 | + } |
|
31 | 33 | return $str; |
32 | 34 | } |
33 | 35 | |
@@ -42,8 +44,9 @@ discard block |
||
42 | 44 | $element=Javascript::prep_element($element); |
43 | 45 | $value=Javascript::prep_value($value); |
44 | 46 | $str="$({$element}).after({$value});"; |
45 | - if ($immediatly) |
|
46 | - $this->jquery_code_for_compile[]=$str; |
|
47 | + if ($immediatly) { |
|
48 | + $this->jquery_code_for_compile[]=$str; |
|
49 | + } |
|
47 | 50 | return $str; |
48 | 51 | } |
49 | 52 | |
@@ -79,8 +82,9 @@ discard block |
||
79 | 82 | |
80 | 83 | $str="$({$element}).animate({\n$animations\n\t\t}".$speed.$extra.");"; |
81 | 84 | |
82 | - if ($immediatly) |
|
83 | - $this->jquery_code_for_compile[]=$str; |
|
85 | + if ($immediatly) { |
|
86 | + $this->jquery_code_for_compile[]=$str; |
|
87 | + } |
|
84 | 88 | return $str; |
85 | 89 | } |
86 | 90 | |
@@ -105,8 +109,9 @@ discard block |
||
105 | 109 | |
106 | 110 | $str="$({$element}).fadeIn({$speed}{$callback});"; |
107 | 111 | |
108 | - if ($immediatly) |
|
109 | - $this->jquery_code_for_compile[]=$str; |
|
112 | + if ($immediatly) { |
|
113 | + $this->jquery_code_for_compile[]=$str; |
|
114 | + } |
|
110 | 115 | return $str; |
111 | 116 | } |
112 | 117 | |
@@ -131,8 +136,9 @@ discard block |
||
131 | 136 | |
132 | 137 | $str="$({$element}).fadeOut({$speed}{$callback});"; |
133 | 138 | |
134 | - if ($immediatly) |
|
135 | - $this->jquery_code_for_compile[]=$str; |
|
139 | + if ($immediatly) { |
|
140 | + $this->jquery_code_for_compile[]=$str; |
|
141 | + } |
|
136 | 142 | return $str; |
137 | 143 | } |
138 | 144 | |
@@ -157,8 +163,9 @@ discard block |
||
157 | 163 | |
158 | 164 | $str="$({$element}).hide({$speed}{$callback});"; |
159 | 165 | |
160 | - if ($immediatly) |
|
161 | - $this->jquery_code_for_compile[]=$str; |
|
166 | + if ($immediatly) { |
|
167 | + $this->jquery_code_for_compile[]=$str; |
|
168 | + } |
|
162 | 169 | return $str; |
163 | 170 | } |
164 | 171 | |
@@ -185,8 +192,9 @@ discard block |
||
185 | 192 | |
186 | 193 | $str="$({$element}).slideUp({$speed}{$callback});"; |
187 | 194 | |
188 | - if ($immediatly) |
|
189 | - $this->jquery_code_for_compile[]=$str; |
|
195 | + if ($immediatly) { |
|
196 | + $this->jquery_code_for_compile[]=$str; |
|
197 | + } |
|
190 | 198 | return $str; |
191 | 199 | } |
192 | 200 | |
@@ -211,8 +219,9 @@ discard block |
||
211 | 219 | |
212 | 220 | $str="$({$element}).slideDown({$speed}{$callback});"; |
213 | 221 | |
214 | - if ($immediatly) |
|
215 | - $this->jquery_code_for_compile[]=$str; |
|
222 | + if ($immediatly) { |
|
223 | + $this->jquery_code_for_compile[]=$str; |
|
224 | + } |
|
216 | 225 | return $str; |
217 | 226 | } |
218 | 227 | |
@@ -237,8 +246,9 @@ discard block |
||
237 | 246 | |
238 | 247 | $str="$({$element}).slideToggle({$speed}{$callback});"; |
239 | 248 | |
240 | - if ($immediatly) |
|
241 | - $this->jquery_code_for_compile[]=$str; |
|
249 | + if ($immediatly) { |
|
250 | + $this->jquery_code_for_compile[]=$str; |
|
251 | + } |
|
242 | 252 | return $str; |
243 | 253 | } |
244 | 254 | |
@@ -255,8 +265,9 @@ discard block |
||
255 | 265 | $element=Javascript::prep_element($element); |
256 | 266 | $str="$({$element}).toggle();"; |
257 | 267 | |
258 | - if ($immediatly) |
|
259 | - $this->jquery_code_for_compile[]=$str; |
|
268 | + if ($immediatly) { |
|
269 | + $this->jquery_code_for_compile[]=$str; |
|
270 | + } |
|
260 | 271 | return $str; |
261 | 272 | } |
262 | 273 | |
@@ -272,8 +283,9 @@ discard block |
||
272 | 283 | $element=Javascript::prep_element($element); |
273 | 284 | $str="$({$element}).trigger(\"$event\");"; |
274 | 285 | |
275 | - if ($immediatly) |
|
276 | - $this->jquery_code_for_compile[]=$str; |
|
286 | + if ($immediatly) { |
|
287 | + $this->jquery_code_for_compile[]=$str; |
|
288 | + } |
|
277 | 289 | return $str; |
278 | 290 | } |
279 | 291 | |
@@ -298,8 +310,9 @@ discard block |
||
298 | 310 | |
299 | 311 | $str="$({$element}).show({$speed}{$callback});"; |
300 | 312 | |
301 | - if ($immediatly) |
|
302 | - $this->jquery_code_for_compile[]=$str; |
|
313 | + if ($immediatly) { |
|
314 | + $this->jquery_code_for_compile[]=$str; |
|
315 | + } |
|
303 | 316 | return $str; |
304 | 317 | } |
305 | 318 | |
@@ -317,8 +330,9 @@ discard block |
||
317 | 330 | $str.="else{".$jsCodeIfFalse."}"; |
318 | 331 | } |
319 | 332 | |
320 | - if ($immediatly) |
|
321 | - $this->jquery_code_for_compile[]=$str; |
|
333 | + if ($immediatly) { |
|
334 | + $this->jquery_code_for_compile[]=$str; |
|
335 | + } |
|
322 | 336 | return $str; |
323 | 337 | } |
324 | 338 | |
@@ -335,11 +349,13 @@ discard block |
||
335 | 349 | public function _doJQuery($element, $jqueryCall, $param="", $jsCallback="", $immediatly=false) { |
336 | 350 | $param=Javascript::prep_value($param); |
337 | 351 | $callback=""; |
338 | - if ($jsCallback!="") |
|
339 | - $callback=", function(event){\n{$jsCallback}\n}"; |
|
352 | + if ($jsCallback!="") { |
|
353 | + $callback=", function(event){\n{$jsCallback}\n}"; |
|
354 | + } |
|
340 | 355 | $script="$(".Javascript::prep_element($element).").".$jqueryCall."(".$param.$callback.");\n"; |
341 | - if ($immediatly) |
|
342 | - $this->jquery_code_for_compile[]=$script; |
|
356 | + if ($immediatly) { |
|
357 | + $this->jquery_code_for_compile[]=$script; |
|
358 | + } |
|
343 | 359 | return $script; |
344 | 360 | } |
345 | 361 | |
@@ -368,8 +384,9 @@ discard block |
||
368 | 384 | */ |
369 | 385 | public function _exec($js, $immediatly=false) { |
370 | 386 | $script=$js."\n"; |
371 | - if ($immediatly) |
|
372 | - $this->jquery_code_for_compile[]=$script; |
|
387 | + if ($immediatly) { |
|
388 | + $this->jquery_code_for_compile[]=$script; |
|
389 | + } |
|
373 | 390 | return $script; |
374 | 391 | } |
375 | 392 |
@@ -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 |
@@ -57,7 +57,7 @@ discard block |
||
57 | 57 | $this->setTagName("div"); |
58 | 58 | $this->removeProperty("href"); |
59 | 59 | $this->addToPropertyCtrl("class", "active", array("active")); |
60 | - }else{ |
|
60 | + } else{ |
|
61 | 61 | $this->removePropertyValue("class", "active"); |
62 | 62 | } |
63 | 63 | return $this; |
@@ -65,8 +65,9 @@ discard block |
||
65 | 65 | |
66 | 66 | public function asLink($href=NULL,$part=NULL){ |
67 | 67 | $this->setTagName("a"); |
68 | - if(isset($href)) |
|
69 | - $this->setProperty("href", $href); |
|
68 | + if(isset($href)) { |
|
69 | + $this->setProperty("href", $href); |
|
70 | + } |
|
70 | 71 | return $this; |
71 | 72 | } |
72 | 73 | |
@@ -77,8 +78,9 @@ discard block |
||
77 | 78 | * @see \Ajax\semantic\html\base\HtmlSemDoubleElement::compile() |
78 | 79 | */ |
79 | 80 | public function compile(JsUtils $js=NULL, &$view=NULL) { |
80 | - if(\is_array($this->content) && JArray::isAssociative($this->content)) |
|
81 | - $this->content=JArray::sortAssociative($this->content, [ "icon","image","content" ]); |
|
81 | + if(\is_array($this->content) && JArray::isAssociative($this->content)) { |
|
82 | + $this->content=JArray::sortAssociative($this->content, [ "icon","image","content" ]); |
|
83 | + } |
|
82 | 84 | return parent::compile($js, $view); |
83 | 85 | } |
84 | 86 | } |
85 | 87 | \ No newline at end of file |
@@ -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 | } |