@@ -8,22 +8,22 @@ discard block |
||
8 | 8 | * @property string $root |
9 | 9 | * @property string $attr |
10 | 10 | */ |
11 | -trait NavElementTrait{ |
|
11 | +trait NavElementTrait { |
|
12 | 12 | |
13 | 13 | abstract public function contentAsString(); |
14 | 14 | /** |
15 | 15 | * Generate the jquery script to set the elements to the HtmlNavElement |
16 | 16 | * @param JsUtils $jsUtils |
17 | 17 | */ |
18 | - public function jsSetContent(JsUtils $jsUtils){ |
|
19 | - $jsUtils->html("#".$this->identifier,str_replace("\"","'", $this->contentAsString()),true); |
|
18 | + public function jsSetContent(JsUtils $jsUtils) { |
|
19 | + $jsUtils->html("#".$this->identifier, str_replace("\"", "'", $this->contentAsString()), true); |
|
20 | 20 | } |
21 | 21 | |
22 | 22 | public function getRoot() { |
23 | 23 | return $this->root; |
24 | 24 | } |
25 | 25 | public function setRoot($root) { |
26 | - $this->root = $root; |
|
26 | + $this->root=$root; |
|
27 | 27 | return $this; |
28 | 28 | } |
29 | 29 | public function getAttr() { |
@@ -36,12 +36,12 @@ discard block |
||
36 | 36 | * @return HtmlNavElement |
37 | 37 | */ |
38 | 38 | public function setAttr($attr) { |
39 | - $this->attr = $attr; |
|
39 | + $this->attr=$attr; |
|
40 | 40 | return $this; |
41 | 41 | } |
42 | 42 | |
43 | 43 | public function __call($method, $args) { |
44 | - if(isset($this->$method) && is_callable($this->$method)) { |
|
44 | + if (isset($this->$method) && is_callable($this->$method)) { |
|
45 | 45 | return call_user_func_array( |
46 | 46 | $this->$method, |
47 | 47 | $args |
@@ -49,5 +49,5 @@ discard block |
||
49 | 49 | } |
50 | 50 | } |
51 | 51 | |
52 | - abstract public function fromDispatcher(JsUtils $js,$dispatcher,$startIndex=0); |
|
52 | + abstract public function fromDispatcher(JsUtils $js, $dispatcher, $startIndex=0); |
|
53 | 53 | } |
@@ -10,7 +10,7 @@ discard block |
||
10 | 10 | */ |
11 | 11 | trait JsUtilsActionsTrait { |
12 | 12 | |
13 | - abstract public function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false,$immediatly=true); |
|
13 | + abstract public function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false, $immediatly=true); |
|
14 | 14 | /** |
15 | 15 | * show or hide with effect |
16 | 16 | * |
@@ -21,7 +21,7 @@ discard block |
||
21 | 21 | * @param boolean $immediatly defers the execution if set to false |
22 | 22 | * @return string |
23 | 23 | */ |
24 | - protected function _showHideWithEffect($action,$element='this', $speed='', $callback='', $immediatly=false) { |
|
24 | + protected function _showHideWithEffect($action, $element='this', $speed='', $callback='', $immediatly=false) { |
|
25 | 25 | $element=Javascript::prep_element($element); |
26 | 26 | $speed=$this->_validate_speed($speed); |
27 | 27 | if ($callback!='') { |
@@ -38,8 +38,8 @@ discard block |
||
38 | 38 | * @return string |
39 | 39 | */ |
40 | 40 | private function _validate_speed($speed) { |
41 | - if (in_array($speed, array ( |
|
42 | - 'slow','normal','fast' |
|
41 | + if (in_array($speed, array( |
|
42 | + 'slow', 'normal', 'fast' |
|
43 | 43 | ))) { |
44 | 44 | $speed='"'.$speed.'"'; |
45 | 45 | } elseif (preg_match("/[^0-9]/", $speed)) { |
@@ -56,7 +56,7 @@ discard block |
||
56 | 56 | * @param string $param |
57 | 57 | * @param boolean $immediatly delayed if false |
58 | 58 | */ |
59 | - public function _genericCallValue($jQueryCall,$element='this', $param="", $immediatly=false) { |
|
59 | + public function _genericCallValue($jQueryCall, $element='this', $param="", $immediatly=false) { |
|
60 | 60 | $element=Javascript::prep_element($element); |
61 | 61 | if (isset($param)) { |
62 | 62 | $param=Javascript::prep_value($param); |
@@ -76,7 +76,7 @@ discard block |
||
76 | 76 | * @param boolean $immediatly delayed if false |
77 | 77 | * @return string |
78 | 78 | */ |
79 | - public function _genericCallElement($jQueryCall,$to='this', $element, $immediatly=false) { |
|
79 | + public function _genericCallElement($jQueryCall, $to='this', $element, $immediatly=false) { |
|
80 | 80 | $to=Javascript::prep_element($to); |
81 | 81 | $element=Javascript::prep_element($element); |
82 | 82 | $str="$({$to}).{$jQueryCall}({$element});"; |
@@ -93,7 +93,7 @@ discard block |
||
93 | 93 | * @return string |
94 | 94 | */ |
95 | 95 | public function addClass($element='this', $class='', $immediatly=false) { |
96 | - return $this->_genericCallValue('addClass',$element, $class, $immediatly); |
|
96 | + return $this->_genericCallValue('addClass', $element, $class, $immediatly); |
|
97 | 97 | } |
98 | 98 | |
99 | 99 | /** |
@@ -103,8 +103,8 @@ discard block |
||
103 | 103 | * @param boolean $immediatly defers the execution if set to false |
104 | 104 | * @return string |
105 | 105 | */ |
106 | - public function after($to, $element, $immediatly=false){ |
|
107 | - return $this->_genericCallElement('after',$to, $element, $immediatly); |
|
106 | + public function after($to, $element, $immediatly=false) { |
|
107 | + return $this->_genericCallElement('after', $to, $element, $immediatly); |
|
108 | 108 | } |
109 | 109 | |
110 | 110 | /** |
@@ -114,8 +114,8 @@ discard block |
||
114 | 114 | * @param boolean $immediatly defers the execution if set to false |
115 | 115 | * @return string |
116 | 116 | */ |
117 | - public function before($to, $element, $immediatly=false){ |
|
118 | - return $this->_genericCallElement('before',$to, $element, $immediatly); |
|
117 | + public function before($to, $element, $immediatly=false) { |
|
118 | + return $this->_genericCallElement('before', $to, $element, $immediatly); |
|
119 | 119 | } |
120 | 120 | |
121 | 121 | /** |
@@ -143,8 +143,8 @@ discard block |
||
143 | 143 | * @param string $value |
144 | 144 | * @param boolean $immediatly defers the execution if set to false |
145 | 145 | */ |
146 | - public function val($element='this',$value='',$immediatly=false){ |
|
147 | - return $this->_genericCallValue('val',$element,$value,$immediatly); |
|
146 | + public function val($element='this', $value='', $immediatly=false) { |
|
147 | + return $this->_genericCallValue('val', $element, $value, $immediatly); |
|
148 | 148 | } |
149 | 149 | |
150 | 150 | /** |
@@ -154,7 +154,7 @@ discard block |
||
154 | 154 | * @param boolean $immediatly defers the execution if set to false |
155 | 155 | */ |
156 | 156 | public function html($element='this', $value='', $immediatly=false) { |
157 | - return $this->_genericCallValue('html',$element, $value, $immediatly); |
|
157 | + return $this->_genericCallValue('html', $element, $value, $immediatly); |
|
158 | 158 | } |
159 | 159 | |
160 | 160 | /** |
@@ -173,7 +173,7 @@ discard block |
||
173 | 173 | |
174 | 174 | $animations="\t\t\t"; |
175 | 175 | if (\is_array($params)) { |
176 | - foreach ( $params as $param => $value ) { |
|
176 | + foreach ($params as $param => $value) { |
|
177 | 177 | $animations.=$param.': \''.$value.'\', '; |
178 | 178 | } |
179 | 179 | } |
@@ -202,7 +202,7 @@ discard block |
||
202 | 202 | * @return string |
203 | 203 | */ |
204 | 204 | public function append($to, $element, $immediatly=false) { |
205 | - return $this->_genericCallElement('append',$to, $element, $immediatly); |
|
205 | + return $this->_genericCallElement('append', $to, $element, $immediatly); |
|
206 | 206 | } |
207 | 207 | |
208 | 208 | /** |
@@ -213,7 +213,7 @@ discard block |
||
213 | 213 | * @return string |
214 | 214 | */ |
215 | 215 | public function prepend($to, $element, $immediatly=false) { |
216 | - return $this->_genericCallElement('prepend',$to, $element, $immediatly); |
|
216 | + return $this->_genericCallElement('prepend', $to, $element, $immediatly); |
|
217 | 217 | } |
218 | 218 | |
219 | 219 | /** |
@@ -226,7 +226,7 @@ discard block |
||
226 | 226 | * @return string |
227 | 227 | */ |
228 | 228 | public function fadeIn($element='this', $speed='', $callback='', $immediatly=false) { |
229 | - return $this->_showHideWithEffect("fadeIn",$element,$speed,$callback,$immediatly); |
|
229 | + return $this->_showHideWithEffect("fadeIn", $element, $speed, $callback, $immediatly); |
|
230 | 230 | } |
231 | 231 | |
232 | 232 | /** |
@@ -239,7 +239,7 @@ discard block |
||
239 | 239 | * @return string |
240 | 240 | */ |
241 | 241 | public function fadeOut($element='this', $speed='', $callback='', $immediatly=false) { |
242 | - return $this->_showHideWithEffect("fadeOut",$element,$speed,$callback,$immediatly); |
|
242 | + return $this->_showHideWithEffect("fadeOut", $element, $speed, $callback, $immediatly); |
|
243 | 243 | } |
244 | 244 | |
245 | 245 | /** |
@@ -252,7 +252,7 @@ discard block |
||
252 | 252 | * @return string |
253 | 253 | */ |
254 | 254 | public function slideUp($element='this', $speed='', $callback='', $immediatly=false) { |
255 | - return $this->_showHideWithEffect("slideUp",$element,$speed,$callback,$immediatly); |
|
255 | + return $this->_showHideWithEffect("slideUp", $element, $speed, $callback, $immediatly); |
|
256 | 256 | } |
257 | 257 | |
258 | 258 | /** |
@@ -264,7 +264,7 @@ discard block |
||
264 | 264 | * @return string |
265 | 265 | */ |
266 | 266 | public function removeClass($element='this', $class='', $immediatly=false) { |
267 | - return $this->_genericCall('removeClass',$element, $class, $immediatly); |
|
267 | + return $this->_genericCall('removeClass', $element, $class, $immediatly); |
|
268 | 268 | } |
269 | 269 | |
270 | 270 | /** |
@@ -277,7 +277,7 @@ discard block |
||
277 | 277 | * @return string |
278 | 278 | */ |
279 | 279 | public function slideDown($element='this', $speed='', $callback='', $immediatly=false) { |
280 | - return $this->_showHideWithEffect("slideDown",$element,$speed,$callback,$immediatly); |
|
280 | + return $this->_showHideWithEffect("slideDown", $element, $speed, $callback, $immediatly); |
|
281 | 281 | } |
282 | 282 | |
283 | 283 | /** |
@@ -290,7 +290,7 @@ discard block |
||
290 | 290 | * @return string |
291 | 291 | */ |
292 | 292 | public function slideToggle($element='this', $speed='', $callback='', $immediatly=false) { |
293 | - return $this->_showHideWithEffect("slideToggle",$element,$speed,$callback,$immediatly); |
|
293 | + return $this->_showHideWithEffect("slideToggle", $element, $speed, $callback, $immediatly); |
|
294 | 294 | } |
295 | 295 | |
296 | 296 | /** |
@@ -303,7 +303,7 @@ discard block |
||
303 | 303 | * @return string |
304 | 304 | */ |
305 | 305 | public function hide($element='this', $speed='', $callback='', $immediatly=false) { |
306 | - return $this->_showHideWithEffect("hide",$element,$speed,$callback,$immediatly); |
|
306 | + return $this->_showHideWithEffect("hide", $element, $speed, $callback, $immediatly); |
|
307 | 307 | } |
308 | 308 | |
309 | 309 | /** |
@@ -316,7 +316,7 @@ discard block |
||
316 | 316 | * @return string |
317 | 317 | */ |
318 | 318 | public function toggle($element='this', $speed='', $callback='', $immediatly=false) { |
319 | - return $this->_showHideWithEffect("toggle",$element,$speed,$callback,$immediatly); |
|
319 | + return $this->_showHideWithEffect("toggle", $element, $speed, $callback, $immediatly); |
|
320 | 320 | } |
321 | 321 | |
322 | 322 | /** |
@@ -327,7 +327,7 @@ discard block |
||
327 | 327 | * @return string |
328 | 328 | */ |
329 | 329 | public function toggleClass($element='this', $class='', $immediatly=false) { |
330 | - return $this->_genericCallValue('toggleClass',$element, $class, $immediatly); |
|
330 | + return $this->_genericCallValue('toggleClass', $element, $class, $immediatly); |
|
331 | 331 | } |
332 | 332 | |
333 | 333 | /** |
@@ -355,7 +355,7 @@ discard block |
||
355 | 355 | * @return string |
356 | 356 | */ |
357 | 357 | public function show($element='this', $speed='', $callback='', $immediatly=false) { |
358 | - return $this->_showHideWithEffect("show",$element,$speed,$callback,$immediatly); |
|
358 | + return $this->_showHideWithEffect("show", $element, $speed, $callback, $immediatly); |
|
359 | 359 | } |
360 | 360 | |
361 | 361 | /** |
@@ -367,8 +367,8 @@ discard block |
||
367 | 367 | */ |
368 | 368 | public function sortable($element, $options=array()) { |
369 | 369 | if (count($options)>0) { |
370 | - $sort_options=array (); |
|
371 | - foreach ( $options as $k => $v ) { |
|
370 | + $sort_options=array(); |
|
371 | + foreach ($options as $k => $v) { |
|
372 | 372 | $sort_options[]="\n\t\t".$k.': '.$v.""; |
373 | 373 | } |
374 | 374 | $sort_options=implode(",", $sort_options); |
@@ -465,8 +465,8 @@ discard block |
||
465 | 465 | * @param boolean $immediatly |
466 | 466 | * @return string |
467 | 467 | */ |
468 | - private function _doJQueryOn($event, $element, $elementToModify, $jqueryCall, $param="", $preventDefault=false, $stopPropagation=false, $jsCallback="",$immediatly=true) { |
|
469 | - return $this->_add_event($element, $this->_doJQuery($elementToModify, $jqueryCall, $param, $jsCallback), $event, $preventDefault, $stopPropagation,$immediatly); |
|
468 | + private function _doJQueryOn($event, $element, $elementToModify, $jqueryCall, $param="", $preventDefault=false, $stopPropagation=false, $jsCallback="", $immediatly=true) { |
|
469 | + return $this->_add_event($element, $this->_doJQuery($elementToModify, $jqueryCall, $param, $jsCallback), $event, $preventDefault, $stopPropagation, $immediatly); |
|
470 | 470 | } |
471 | 471 | |
472 | 472 | /** |
@@ -484,7 +484,7 @@ discard block |
||
484 | 484 | $preventDefault=false; |
485 | 485 | $immediatly=true; |
486 | 486 | extract($parameters); |
487 | - return $this->_doJQueryOn($event, $element, $elementToModify, $jqueryCall, $param, $preventDefault, $stopPropagation, $jsCallback,$immediatly); |
|
487 | + return $this->_doJQueryOn($event, $element, $elementToModify, $jqueryCall, $param, $preventDefault, $stopPropagation, $jsCallback, $immediatly); |
|
488 | 488 | } |
489 | 489 | |
490 | 490 | /** |
@@ -513,7 +513,7 @@ discard block |
||
513 | 513 | $preventDefault=false; |
514 | 514 | $immediatly=true; |
515 | 515 | extract($parameters); |
516 | - $script=$this->_add_event($element, $this->exec($js), $event, $preventDefault, $stopPropagation,$immediatly); |
|
516 | + $script=$this->_add_event($element, $this->exec($js), $event, $preventDefault, $stopPropagation, $immediatly); |
|
517 | 517 | return $script; |
518 | 518 | } |
519 | 519 | } |
@@ -28,8 +28,9 @@ discard block |
||
28 | 28 | $callback=", function(){\n{$callback}\n}"; |
29 | 29 | } |
30 | 30 | $str="$({$element}).{$action}({$speed}{$callback});"; |
31 | - if ($immediatly) |
|
32 | - $this->jquery_code_for_compile[]=$str; |
|
31 | + if ($immediatly) { |
|
32 | + $this->jquery_code_for_compile[]=$str; |
|
33 | + } |
|
33 | 34 | return $str; |
34 | 35 | } |
35 | 36 | /** |
@@ -61,10 +62,12 @@ discard block |
||
61 | 62 | if (isset($param)) { |
62 | 63 | $param=Javascript::prep_value($param); |
63 | 64 | $str="$({$element}).{$jQueryCall}({$param});"; |
64 | - } else |
|
65 | - $str="$({$element}).{$jQueryCall}();"; |
|
66 | - if ($immediatly) |
|
67 | - $this->jquery_code_for_compile[]=$str; |
|
65 | + } else { |
|
66 | + $str="$({$element}).{$jQueryCall}();"; |
|
67 | + } |
|
68 | + if ($immediatly) { |
|
69 | + $this->jquery_code_for_compile[]=$str; |
|
70 | + } |
|
68 | 71 | return $str; |
69 | 72 | } |
70 | 73 | |
@@ -80,8 +83,9 @@ discard block |
||
80 | 83 | $to=Javascript::prep_element($to); |
81 | 84 | $element=Javascript::prep_element($element); |
82 | 85 | $str="$({$to}).{$jQueryCall}({$element});"; |
83 | - if ($immediatly) |
|
84 | - $this->jquery_code_for_compile[]=$str; |
|
86 | + if ($immediatly) { |
|
87 | + $this->jquery_code_for_compile[]=$str; |
|
88 | + } |
|
85 | 89 | return $str; |
86 | 90 | } |
87 | 91 | /** |
@@ -130,10 +134,12 @@ discard block |
||
130 | 134 | if (isset($value)) { |
131 | 135 | $value=Javascript::prep_value($value); |
132 | 136 | $str="$({$element}).attr(\"$attributeName\",{$value});"; |
133 | - } else |
|
134 | - $str="$({$element}).attr(\"$attributeName\");"; |
|
135 | - if ($immediatly) |
|
136 | - $this->jquery_code_for_compile[]=$str; |
|
137 | + } else { |
|
138 | + $str="$({$element}).attr(\"$attributeName\");"; |
|
139 | + } |
|
140 | + if ($immediatly) { |
|
141 | + $this->jquery_code_for_compile[]=$str; |
|
142 | + } |
|
137 | 143 | return $str; |
138 | 144 | } |
139 | 145 | |
@@ -189,8 +195,9 @@ discard block |
||
189 | 195 | |
190 | 196 | $str="$({$element}).animate({\n$animations\n\t\t}".$speed.$extra.");"; |
191 | 197 | |
192 | - if ($immediatly) |
|
193 | - $this->jquery_code_for_compile[]=$str; |
|
198 | + if ($immediatly) { |
|
199 | + $this->jquery_code_for_compile[]=$str; |
|
200 | + } |
|
194 | 201 | return $str; |
195 | 202 | } |
196 | 203 | |
@@ -340,8 +347,9 @@ discard block |
||
340 | 347 | $element=Javascript::prep_element($element); |
341 | 348 | $str="$({$element}).trigger(\"$event\");"; |
342 | 349 | |
343 | - if ($immediatly) |
|
344 | - $this->jquery_code_for_compile[]=$str; |
|
350 | + if ($immediatly) { |
|
351 | + $this->jquery_code_for_compile[]=$str; |
|
352 | + } |
|
345 | 353 | return $str; |
346 | 354 | } |
347 | 355 | |
@@ -403,8 +411,9 @@ discard block |
||
403 | 411 | $str.="else{".$jsCodeIfFalse."}"; |
404 | 412 | } |
405 | 413 | |
406 | - if ($immediatly) |
|
407 | - $this->jquery_code_for_compile[]=$str; |
|
414 | + if ($immediatly) { |
|
415 | + $this->jquery_code_for_compile[]=$str; |
|
416 | + } |
|
408 | 417 | return $str; |
409 | 418 | } |
410 | 419 | |
@@ -420,11 +429,13 @@ discard block |
||
420 | 429 | private function _doJQuery($element, $jqueryCall, $param="", $jsCallback="", $immediatly=false) { |
421 | 430 | $param=Javascript::prep_value($param); |
422 | 431 | $callback=""; |
423 | - if ($jsCallback!="") |
|
424 | - $callback=", function(event){\n{$jsCallback}\n}"; |
|
432 | + if ($jsCallback!="") { |
|
433 | + $callback=", function(event){\n{$jsCallback}\n}"; |
|
434 | + } |
|
425 | 435 | $script="$(".Javascript::prep_element($element).").".$jqueryCall."(".$param.$callback.");\n"; |
426 | - if ($immediatly) |
|
427 | - $this->jquery_code_for_compile[]=$script; |
|
436 | + if ($immediatly) { |
|
437 | + $this->jquery_code_for_compile[]=$script; |
|
438 | + } |
|
428 | 439 | return $script; |
429 | 440 | } |
430 | 441 | |
@@ -495,8 +506,9 @@ discard block |
||
495 | 506 | */ |
496 | 507 | public function exec($js, $immediatly=false) { |
497 | 508 | $script=$js."\n"; |
498 | - if ($immediatly) |
|
499 | - $this->jquery_code_for_compile[]=$script; |
|
509 | + if ($immediatly) { |
|
510 | + $this->jquery_code_for_compile[]=$script; |
|
511 | + } |
|
500 | 512 | return $script; |
501 | 513 | } |
502 | 514 |
@@ -18,27 +18,27 @@ discard block |
||
18 | 18 | |
19 | 19 | public function __construct(JsUtils $js=NULL) { |
20 | 20 | parent::__construct($js); |
21 | - $this->events=array (); |
|
21 | + $this->events=array(); |
|
22 | 22 | } |
23 | 23 | |
24 | 24 | protected function compileEvents() { |
25 | - foreach ( $this->events as $event => $jsCode ) { |
|
25 | + foreach ($this->events as $event => $jsCode) { |
|
26 | 26 | $itemSelector=JString::getValueBetween($event); |
27 | - if($event=="execute"){ |
|
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 | } |
35 | 35 | } |
36 | 36 | } |
37 | 37 | |
38 | - protected function _createSelector($itemSelector,$selector){ |
|
39 | - if(!isset($itemSelector)) |
|
38 | + protected function _createSelector($itemSelector, $selector) { |
|
39 | + if (!isset($itemSelector)) |
|
40 | 40 | $itemSelector=$this->itemSelector; |
41 | - if(isset($itemSelector) && $itemSelector!=="") |
|
41 | + if (isset($itemSelector) && $itemSelector!=="") |
|
42 | 42 | $selector.=" ".$itemSelector; |
43 | 43 | return $selector; |
44 | 44 | } |
@@ -47,7 +47,7 @@ discard block |
||
47 | 47 | $result=implode("\n", $this->jquery_code_for_compile); |
48 | 48 | $result=str_ireplace("\"%", "", $result); |
49 | 49 | $result=str_ireplace("%\"", "", $result); |
50 | - $result=str_replace(array ( |
|
50 | + $result=str_replace(array( |
|
51 | 51 | "\\n", |
52 | 52 | "\\r", |
53 | 53 | "\\t" |
@@ -57,7 +57,7 @@ discard block |
||
57 | 57 | |
58 | 58 | public function getScript() { |
59 | 59 | $allParams=$this->params; |
60 | - $this->jquery_code_for_compile=array (); |
|
60 | + $this->jquery_code_for_compile=array(); |
|
61 | 61 | $this->jquery_code_for_compile []="$( \"".$this->attachTo."\" ).{$this->uiName}(".$this->getParamsAsJSON($allParams).");"; |
62 | 62 | $this->compileEvents(); |
63 | 63 | return $this->compileJQueryCode(); |
@@ -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); |
@@ -21,7 +21,7 @@ |
||
21 | 21 | return $this->setParam("context", $value); |
22 | 22 | } |
23 | 23 | |
24 | - public function setOffset($offset=0){ |
|
24 | + public function setOffset($offset=0) { |
|
25 | 25 | return $this->setParam("offset", $offset); |
26 | 26 | } |
27 | 27 | } |
@@ -20,7 +20,7 @@ |
||
20 | 20 | $this->params["onUnchecked"]="%function(){".$value."}%"; |
21 | 21 | } |
22 | 22 | |
23 | - public function setOnChange($value){ |
|
23 | + public function setOnChange($value) { |
|
24 | 24 | $this->params["onChange"]="%function(){".$value."}%"; |
25 | 25 | } |
26 | 26 | } |
@@ -8,16 +8,16 @@ |
||
8 | 8 | class HtmlFormInput extends HtmlFormField { |
9 | 9 | use TextFieldsTrait; |
10 | 10 | |
11 | - public function __construct($identifier, $label=NULL,$type="text",$value=NULL,$placeholder=NULL) { |
|
12 | - if(!isset($placeholder) && $type==="text") |
|
11 | + public function __construct($identifier, $label=NULL, $type="text", $value=NULL, $placeholder=NULL) { |
|
12 | + if (!isset($placeholder) && $type==="text") |
|
13 | 13 | $placeholder=$label; |
14 | - parent::__construct("field-".$identifier, new HtmlInput($identifier,$type,$value,$placeholder), $label); |
|
14 | + parent::__construct("field-".$identifier, new HtmlInput($identifier, $type, $value, $placeholder), $label); |
|
15 | 15 | $this->_identifier=$identifier; |
16 | 16 | } |
17 | 17 | |
18 | - public function getDataField(){ |
|
19 | - $field= $this->getField(); |
|
20 | - if($field instanceof HtmlInput) |
|
18 | + public function getDataField() { |
|
19 | + $field=$this->getField(); |
|
20 | + if ($field instanceof HtmlInput) |
|
21 | 21 | $field=$field->getDataField(); |
22 | 22 | return $field; |
23 | 23 | } |
@@ -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 | } |
@@ -50,7 +50,7 @@ |
||
50 | 50 | * @return $this |
51 | 51 | */ |
52 | 52 | public function setSource($source) { |
53 | - $source=str_ireplace(array ( |
|
53 | + $source=str_ireplace(array( |
|
54 | 54 | "\"", |
55 | 55 | "'" |
56 | 56 | ), "%quote%", $source); |
@@ -15,8 +15,8 @@ discard block |
||
15 | 15 | * @property HtmlSemDoubleElement $_self |
16 | 16 | */ |
17 | 17 | trait BaseTrait { |
18 | - protected $_variations=[ ]; |
|
19 | - protected $_states=[ ]; |
|
18 | + protected $_variations=[]; |
|
19 | + protected $_states=[]; |
|
20 | 20 | protected $_baseClass; |
21 | 21 | |
22 | 22 | abstract protected function setPropertyCtrl($name, $value, $typeCtrl); |
@@ -29,7 +29,7 @@ discard block |
||
29 | 29 | |
30 | 30 | abstract public function setProperty($name, $value); |
31 | 31 | |
32 | - abstract public function addContent($content,$before=false); |
|
32 | + abstract public function addContent($content, $before=false); |
|
33 | 33 | |
34 | 34 | abstract public function onCreate($jsCode); |
35 | 35 | |
@@ -50,7 +50,7 @@ discard block |
||
50 | 50 | $this->_self->setProperty("class", $this->_self->getBaseClass()); |
51 | 51 | if (\is_string($variations)) |
52 | 52 | $variations=\explode(" ", $variations); |
53 | - foreach ( $variations as $variation ) { |
|
53 | + foreach ($variations as $variation) { |
|
54 | 54 | $this->_self->addVariation($variation); |
55 | 55 | } |
56 | 56 | return $this; |
@@ -64,7 +64,7 @@ discard block |
||
64 | 64 | public function addVariations($variations=array()) { |
65 | 65 | if (\is_string($variations)) |
66 | 66 | $variations=\explode(" ", $variations); |
67 | - foreach ( $variations as $variation ) { |
|
67 | + foreach ($variations as $variation) { |
|
68 | 68 | $this->_self->addVariation($variation); |
69 | 69 | } |
70 | 70 | return $this; |
@@ -73,7 +73,7 @@ discard block |
||
73 | 73 | public function addStates($states=array()) { |
74 | 74 | if (\is_string($states)) |
75 | 75 | $states=\explode(" ", $states); |
76 | - foreach ( $states as $state ) { |
|
76 | + foreach ($states as $state) { |
|
77 | 77 | $this->_self->addState($state); |
78 | 78 | } |
79 | 79 | return $this; |
@@ -83,17 +83,17 @@ discard block |
||
83 | 83 | $this->_self->setProperty("class", $this->_self->getBaseClass()); |
84 | 84 | if (\is_string($states)) |
85 | 85 | $states=\explode(" ", $states); |
86 | - foreach ( $states as $state ) { |
|
86 | + foreach ($states as $state) { |
|
87 | 87 | $this->_self->addState($state); |
88 | 88 | } |
89 | 89 | return $this; |
90 | 90 | } |
91 | 91 | |
92 | 92 | public function addIcon($icon, $before=true) { |
93 | - return $this->_self->addContent(new HtmlIcon("icon-" . $this->_self->getIdentifier(), $icon), $before); |
|
93 | + return $this->_self->addContent(new HtmlIcon("icon-".$this->_self->getIdentifier(), $icon), $before); |
|
94 | 94 | } |
95 | 95 | |
96 | - public function addSticky($context="body"){ |
|
96 | + public function addSticky($context="body") { |
|
97 | 97 | $this->_self->onCreate("$('#".$this->_self->getIdentifier()."').sticky({ context: '".$context."'});"); |
98 | 98 | return $this; |
99 | 99 | } |
@@ -114,7 +114,7 @@ discard block |
||
114 | 114 | * @return HtmlSemDoubleElement |
115 | 115 | */ |
116 | 116 | public function setDisabled($disable=true) { |
117 | - if($disable) |
|
117 | + if ($disable) |
|
118 | 118 | $this->_self->addToProperty("class", "disabled"); |
119 | 119 | return $this; |
120 | 120 | } |
@@ -140,7 +140,7 @@ discard block |
||
140 | 140 | * |
141 | 141 | * @return HtmlSemDoubleElement |
142 | 142 | */ |
143 | - public function asHeader(){ |
|
143 | + public function asHeader() { |
|
144 | 144 | return $this->_self->addToProperty("class", "header"); |
145 | 145 | } |
146 | 146 | |
@@ -148,15 +148,15 @@ discard block |
||
148 | 148 | * show it is currently the active user selection |
149 | 149 | * @return HtmlSemDoubleElement |
150 | 150 | */ |
151 | - public function setActive($value=true){ |
|
152 | - if($value) |
|
151 | + public function setActive($value=true) { |
|
152 | + if ($value) |
|
153 | 153 | $this->_self->addToProperty("class", "active"); |
154 | 154 | return $this; |
155 | 155 | } |
156 | 156 | |
157 | - public function setAttached($value=true){ |
|
158 | - if($value) |
|
159 | - $this->_self->addToPropertyCtrl("class", "attached", array ("attached" )); |
|
157 | + public function setAttached($value=true) { |
|
158 | + if ($value) |
|
159 | + $this->_self->addToPropertyCtrl("class", "attached", array("attached")); |
|
160 | 160 | return $this; |
161 | 161 | } |
162 | 162 | |
@@ -164,13 +164,13 @@ discard block |
||
164 | 164 | * can be formatted to appear on dark backgrounds |
165 | 165 | */ |
166 | 166 | public function setInverted($recursive=true) { |
167 | - if($recursive===true){ |
|
167 | + if ($recursive===true) { |
|
168 | 168 | $content=$this->_self->getContent(); |
169 | - if($content instanceof HtmlSemDoubleElement) |
|
169 | + if ($content instanceof HtmlSemDoubleElement) |
|
170 | 170 | $content->setInverted($recursive); |
171 | - elseif(\is_array($content) || $content instanceof \Traversable){ |
|
172 | - foreach ($content as $elm){ |
|
173 | - if($elm instanceof HtmlSemDoubleElement){ |
|
171 | + elseif (\is_array($content) || $content instanceof \Traversable) { |
|
172 | + foreach ($content as $elm) { |
|
173 | + if ($elm instanceof HtmlSemDoubleElement) { |
|
174 | 174 | $elm->setInverted($recursive); |
175 | 175 | } |
176 | 176 | } |
@@ -184,7 +184,7 @@ discard block |
||
184 | 184 | } |
185 | 185 | |
186 | 186 | public function setFloated($direction="right") { |
187 | - return $this->_self->addToPropertyCtrl("class", $direction . " floated", Direction::getConstantValues("floated")); |
|
187 | + return $this->_self->addToPropertyCtrl("class", $direction." floated", Direction::getConstantValues("floated")); |
|
188 | 188 | } |
189 | 189 | |
190 | 190 | public function floatRight() { |
@@ -199,14 +199,14 @@ discard block |
||
199 | 199 | return $this->_baseClass; |
200 | 200 | } |
201 | 201 | |
202 | - protected function addBehavior(&$array,$key,$value,$before="",$after=""){ |
|
203 | - if(\is_string($value)){ |
|
204 | - if(isset($array[$key])){ |
|
202 | + protected function addBehavior(&$array, $key, $value, $before="", $after="") { |
|
203 | + if (\is_string($value)) { |
|
204 | + if (isset($array[$key])) { |
|
205 | 205 | $p=JString::replaceAtFirstAndLast($array[$key], $before, "", $after, ""); |
206 | 206 | $array[$key]=$before.$p.$value.$after; |
207 | - }else |
|
207 | + } else |
|
208 | 208 | $array[$key]=$before.$value.$after; |
209 | - }else{ |
|
209 | + } else { |
|
210 | 210 | $array[$key]=$value; |
211 | 211 | } |
212 | 212 | return $this; |
@@ -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; |
@@ -17,6 +17,6 @@ |
||
17 | 17 | if (isset($toElement) && \method_exists($toElement, "setAttached")) { |
18 | 18 | $toElement->setAttached(true); |
19 | 19 | } |
20 | - return $this->addToPropertyCtrl("class", $side . " attached", Side::getConstantValues("attached")); |
|
20 | + return $this->addToPropertyCtrl("class", $side." attached", Side::getConstantValues("attached")); |
|
21 | 21 | } |
22 | 22 | } |