@@ -11,7 +11,7 @@ discard block |
||
11 | 11 | */ |
12 | 12 | trait JsUtilsActionsTrait { |
13 | 13 | |
14 | - abstract public function _add_event($element, $js, $event, $preventDefault = false, $stopPropagation = false, $immediatly = true); |
|
14 | + abstract public function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false, $immediatly=true); |
|
15 | 15 | |
16 | 16 | /** |
17 | 17 | * show or hide with effect |
@@ -27,15 +27,15 @@ discard block |
||
27 | 27 | * defers the execution if set to false |
28 | 28 | * @return string |
29 | 29 | */ |
30 | - protected function _showHideWithEffect($action, $element = 'this', $speed = '', $callback = '', $immediatly = false) { |
|
31 | - $element = Javascript::prep_element($element); |
|
32 | - $speed = $this->_validate_speed($speed); |
|
33 | - if ($callback != '') { |
|
34 | - $callback = ", function(){\n{$callback}\n}"; |
|
30 | + protected function _showHideWithEffect($action, $element='this', $speed='', $callback='', $immediatly=false) { |
|
31 | + $element=Javascript::prep_element($element); |
|
32 | + $speed=$this->_validate_speed($speed); |
|
33 | + if ($callback!='') { |
|
34 | + $callback=", function(){\n{$callback}\n}"; |
|
35 | 35 | } |
36 | - $str = "$({$element}).{$action}({$speed}{$callback});"; |
|
36 | + $str="$({$element}).{$action}({$speed}{$callback});"; |
|
37 | 37 | if ($immediatly) |
38 | - $this->jquery_code_for_compile[] = $str; |
|
38 | + $this->jquery_code_for_compile[]=$str; |
|
39 | 39 | return $str; |
40 | 40 | } |
41 | 41 | |
@@ -51,9 +51,9 @@ discard block |
||
51 | 51 | 'normal', |
52 | 52 | 'fast' |
53 | 53 | ))) { |
54 | - $speed = '"' . $speed . '"'; |
|
54 | + $speed='"'.$speed.'"'; |
|
55 | 55 | } elseif (preg_match("/[^0-9]/", $speed)) { |
56 | - $speed = ''; |
|
56 | + $speed=''; |
|
57 | 57 | } |
58 | 58 | |
59 | 59 | return $speed; |
@@ -68,15 +68,15 @@ discard block |
||
68 | 68 | * @param boolean $immediatly |
69 | 69 | * delayed if false |
70 | 70 | */ |
71 | - public function _genericCallValue($jQueryCall, $element = 'this', $param = "", $immediatly = false) { |
|
72 | - $element = Javascript::prep_element($element); |
|
71 | + public function _genericCallValue($jQueryCall, $element='this', $param="", $immediatly=false) { |
|
72 | + $element=Javascript::prep_element($element); |
|
73 | 73 | if (isset($param)) { |
74 | - $param = Javascript::prep_value($param); |
|
75 | - $str = "$({$element}).{$jQueryCall}({$param});"; |
|
74 | + $param=Javascript::prep_value($param); |
|
75 | + $str="$({$element}).{$jQueryCall}({$param});"; |
|
76 | 76 | } else |
77 | - $str = "$({$element}).{$jQueryCall}();"; |
|
77 | + $str="$({$element}).{$jQueryCall}();"; |
|
78 | 78 | if ($immediatly) |
79 | - $this->jquery_code_for_compile[] = $str; |
|
79 | + $this->jquery_code_for_compile[]=$str; |
|
80 | 80 | return $str; |
81 | 81 | } |
82 | 82 | |
@@ -90,12 +90,12 @@ discard block |
||
90 | 90 | * delayed if false |
91 | 91 | * @return string |
92 | 92 | */ |
93 | - public function _genericCallElement($jQueryCall, $to = 'this', $element, $immediatly = false) { |
|
94 | - $to = Javascript::prep_element($to); |
|
95 | - $element = Javascript::prep_element($element); |
|
96 | - $str = "$({$to}).{$jQueryCall}({$element});"; |
|
93 | + public function _genericCallElement($jQueryCall, $to='this', $element, $immediatly=false) { |
|
94 | + $to=Javascript::prep_element($to); |
|
95 | + $element=Javascript::prep_element($element); |
|
96 | + $str="$({$to}).{$jQueryCall}({$element});"; |
|
97 | 97 | if ($immediatly) |
98 | - $this->jquery_code_for_compile[] = $str; |
|
98 | + $this->jquery_code_for_compile[]=$str; |
|
99 | 99 | return $str; |
100 | 100 | } |
101 | 101 | |
@@ -109,7 +109,7 @@ discard block |
||
109 | 109 | * defers the execution if set to false |
110 | 110 | * @return string |
111 | 111 | */ |
112 | - public function addClass($element = 'this', $class = '', $immediatly = false) { |
|
112 | + public function addClass($element='this', $class='', $immediatly=false) { |
|
113 | 113 | return $this->_genericCallValue('addClass', $element, $class, $immediatly); |
114 | 114 | } |
115 | 115 | |
@@ -122,7 +122,7 @@ discard block |
||
122 | 122 | * defers the execution if set to false |
123 | 123 | * @return string |
124 | 124 | */ |
125 | - public function after($to, $element, $immediatly = false) { |
|
125 | + public function after($to, $element, $immediatly=false) { |
|
126 | 126 | return $this->_genericCallElement('after', $to, $element, $immediatly); |
127 | 127 | } |
128 | 128 | |
@@ -135,7 +135,7 @@ discard block |
||
135 | 135 | * defers the execution if set to false |
136 | 136 | * @return string |
137 | 137 | */ |
138 | - public function before($to, $element, $immediatly = false) { |
|
138 | + public function before($to, $element, $immediatly=false) { |
|
139 | 139 | return $this->_genericCallElement('before', $to, $element, $immediatly); |
140 | 140 | } |
141 | 141 | |
@@ -148,15 +148,15 @@ discard block |
||
148 | 148 | * @param boolean $immediatly |
149 | 149 | * delayed if false |
150 | 150 | */ |
151 | - public function attr($element = 'this', $attributeName, $value = "", $immediatly = false) { |
|
152 | - $element = Javascript::prep_element($element); |
|
151 | + public function attr($element='this', $attributeName, $value="", $immediatly=false) { |
|
152 | + $element=Javascript::prep_element($element); |
|
153 | 153 | if (isset($value)) { |
154 | - $value = Javascript::prep_value($value); |
|
155 | - $str = "$({$element}).attr(\"$attributeName\",{$value});"; |
|
154 | + $value=Javascript::prep_value($value); |
|
155 | + $str="$({$element}).attr(\"$attributeName\",{$value});"; |
|
156 | 156 | } else |
157 | - $str = "$({$element}).attr(\"$attributeName\");"; |
|
157 | + $str="$({$element}).attr(\"$attributeName\");"; |
|
158 | 158 | if ($immediatly) |
159 | - $this->jquery_code_for_compile[] = $str; |
|
159 | + $this->jquery_code_for_compile[]=$str; |
|
160 | 160 | return $str; |
161 | 161 | } |
162 | 162 | |
@@ -168,7 +168,7 @@ discard block |
||
168 | 168 | * @param boolean $immediatly |
169 | 169 | * defers the execution if set to false |
170 | 170 | */ |
171 | - public function val($element = 'this', $value = '', $immediatly = false) { |
|
171 | + public function val($element='this', $value='', $immediatly=false) { |
|
172 | 172 | return $this->_genericCallValue('val', $element, $value, $immediatly); |
173 | 173 | } |
174 | 174 | |
@@ -180,7 +180,7 @@ discard block |
||
180 | 180 | * @param boolean $immediatly |
181 | 181 | * defers the execution if set to false |
182 | 182 | */ |
183 | - public function html($element = 'this', $value = '', $immediatly = false) { |
|
183 | + public function html($element='this', $value='', $immediatly=false) { |
|
184 | 184 | return $this->_genericCallValue('html', $element, $value, $immediatly); |
185 | 185 | } |
186 | 186 | |
@@ -197,30 +197,30 @@ discard block |
||
197 | 197 | * defers the execution if set to false |
198 | 198 | * @return string |
199 | 199 | */ |
200 | - public function animate($element = 'this', $params = array(), $speed = '', $extra = '', $immediatly = false) { |
|
201 | - $element = Javascript::prep_element($element); |
|
202 | - $speed = $this->_validate_speed($speed); |
|
200 | + public function animate($element='this', $params=array(), $speed='', $extra='', $immediatly=false) { |
|
201 | + $element=Javascript::prep_element($element); |
|
202 | + $speed=$this->_validate_speed($speed); |
|
203 | 203 | |
204 | - $animations = "\t\t\t"; |
|
204 | + $animations="\t\t\t"; |
|
205 | 205 | if (\is_array($params)) { |
206 | 206 | foreach ($params as $param => $value) { |
207 | - $animations .= $param . ': \'' . $value . '\', '; |
|
207 | + $animations.=$param.': \''.$value.'\', '; |
|
208 | 208 | } |
209 | 209 | } |
210 | - $animations = substr($animations, 0, - 2); // remove the last ", " |
|
210 | + $animations=substr($animations, 0, - 2); // remove the last ", " |
|
211 | 211 | |
212 | - if ($speed != '') { |
|
213 | - $speed = ', ' . $speed; |
|
212 | + if ($speed!='') { |
|
213 | + $speed=', '.$speed; |
|
214 | 214 | } |
215 | 215 | |
216 | - if ($extra != '') { |
|
217 | - $extra = ', ' . $extra; |
|
216 | + if ($extra!='') { |
|
217 | + $extra=', '.$extra; |
|
218 | 218 | } |
219 | 219 | |
220 | - $str = "$({$element}).animate({\n$animations\n\t\t}" . $speed . $extra . ");"; |
|
220 | + $str="$({$element}).animate({\n$animations\n\t\t}".$speed.$extra.");"; |
|
221 | 221 | |
222 | 222 | if ($immediatly) |
223 | - $this->jquery_code_for_compile[] = $str; |
|
223 | + $this->jquery_code_for_compile[]=$str; |
|
224 | 224 | return $str; |
225 | 225 | } |
226 | 226 | |
@@ -233,7 +233,7 @@ discard block |
||
233 | 233 | * defers the execution if set to false |
234 | 234 | * @return string |
235 | 235 | */ |
236 | - public function append($to, $element, $immediatly = false) { |
|
236 | + public function append($to, $element, $immediatly=false) { |
|
237 | 237 | return $this->_genericCallElement('append', $to, $element, $immediatly); |
238 | 238 | } |
239 | 239 | |
@@ -246,7 +246,7 @@ discard block |
||
246 | 246 | * defers the execution if set to false |
247 | 247 | * @return string |
248 | 248 | */ |
249 | - public function prepend($to, $element, $immediatly = false) { |
|
249 | + public function prepend($to, $element, $immediatly=false) { |
|
250 | 250 | return $this->_genericCallElement('prepend', $to, $element, $immediatly); |
251 | 251 | } |
252 | 252 | |
@@ -263,7 +263,7 @@ discard block |
||
263 | 263 | * defers the execution if set to false |
264 | 264 | * @return string |
265 | 265 | */ |
266 | - public function fadeIn($element = 'this', $speed = '', $callback = '', $immediatly = false) { |
|
266 | + public function fadeIn($element='this', $speed='', $callback='', $immediatly=false) { |
|
267 | 267 | return $this->_showHideWithEffect("fadeIn", $element, $speed, $callback, $immediatly); |
268 | 268 | } |
269 | 269 | |
@@ -280,7 +280,7 @@ discard block |
||
280 | 280 | * defers the execution if set to false |
281 | 281 | * @return string |
282 | 282 | */ |
283 | - public function fadeOut($element = 'this', $speed = '', $callback = '', $immediatly = false) { |
|
283 | + public function fadeOut($element='this', $speed='', $callback='', $immediatly=false) { |
|
284 | 284 | return $this->_showHideWithEffect("fadeOut", $element, $speed, $callback, $immediatly); |
285 | 285 | } |
286 | 286 | |
@@ -297,7 +297,7 @@ discard block |
||
297 | 297 | * defers the execution if set to false |
298 | 298 | * @return string |
299 | 299 | */ |
300 | - public function slideUp($element = 'this', $speed = '', $callback = '', $immediatly = false) { |
|
300 | + public function slideUp($element='this', $speed='', $callback='', $immediatly=false) { |
|
301 | 301 | return $this->_showHideWithEffect("slideUp", $element, $speed, $callback, $immediatly); |
302 | 302 | } |
303 | 303 | |
@@ -312,7 +312,7 @@ discard block |
||
312 | 312 | * defers the execution if set to false |
313 | 313 | * @return string |
314 | 314 | */ |
315 | - public function removeClass($element = 'this', $class = '', $immediatly = false) { |
|
315 | + public function removeClass($element='this', $class='', $immediatly=false) { |
|
316 | 316 | return $this->_genericCallValue('removeClass', $element, $class, $immediatly); |
317 | 317 | } |
318 | 318 | |
@@ -329,7 +329,7 @@ discard block |
||
329 | 329 | * defers the execution if set to false |
330 | 330 | * @return string |
331 | 331 | */ |
332 | - public function slideDown($element = 'this', $speed = '', $callback = '', $immediatly = false) { |
|
332 | + public function slideDown($element='this', $speed='', $callback='', $immediatly=false) { |
|
333 | 333 | return $this->_showHideWithEffect("slideDown", $element, $speed, $callback, $immediatly); |
334 | 334 | } |
335 | 335 | |
@@ -346,7 +346,7 @@ discard block |
||
346 | 346 | * defers the execution if set to false |
347 | 347 | * @return string |
348 | 348 | */ |
349 | - public function slideToggle($element = 'this', $speed = '', $callback = '', $immediatly = false) { |
|
349 | + public function slideToggle($element='this', $speed='', $callback='', $immediatly=false) { |
|
350 | 350 | return $this->_showHideWithEffect("slideToggle", $element, $speed, $callback, $immediatly); |
351 | 351 | } |
352 | 352 | |
@@ -363,7 +363,7 @@ discard block |
||
363 | 363 | * defers the execution if set to false |
364 | 364 | * @return string |
365 | 365 | */ |
366 | - public function hide($element = 'this', $speed = '', $callback = '', $immediatly = false) { |
|
366 | + public function hide($element='this', $speed='', $callback='', $immediatly=false) { |
|
367 | 367 | return $this->_showHideWithEffect("hide", $element, $speed, $callback, $immediatly); |
368 | 368 | } |
369 | 369 | |
@@ -380,7 +380,7 @@ discard block |
||
380 | 380 | * defers the execution if set to false |
381 | 381 | * @return string |
382 | 382 | */ |
383 | - public function toggle($element = 'this', $speed = '', $callback = '', $immediatly = false) { |
|
383 | + public function toggle($element='this', $speed='', $callback='', $immediatly=false) { |
|
384 | 384 | return $this->_showHideWithEffect("toggle", $element, $speed, $callback, $immediatly); |
385 | 385 | } |
386 | 386 | |
@@ -394,7 +394,7 @@ discard block |
||
394 | 394 | * defers the execution if set to false |
395 | 395 | * @return string |
396 | 396 | */ |
397 | - public function toggleClass($element = 'this', $class = '', $immediatly = false) { |
|
397 | + public function toggleClass($element='this', $class='', $immediatly=false) { |
|
398 | 398 | return $this->_genericCallValue('toggleClass', $element, $class, $immediatly); |
399 | 399 | } |
400 | 400 | |
@@ -406,12 +406,12 @@ discard block |
||
406 | 406 | * @param boolean $immediatly |
407 | 407 | * defers the execution if set to false |
408 | 408 | */ |
409 | - public function trigger($element = 'this', $event = 'click', $immediatly = false) { |
|
410 | - $element = Javascript::prep_element($element); |
|
411 | - $str = "$({$element}).trigger(\"$event\");"; |
|
409 | + public function trigger($element='this', $event='click', $immediatly=false) { |
|
410 | + $element=Javascript::prep_element($element); |
|
411 | + $str="$({$element}).trigger(\"$event\");"; |
|
412 | 412 | |
413 | 413 | if ($immediatly) |
414 | - $this->jquery_code_for_compile[] = $str; |
|
414 | + $this->jquery_code_for_compile[]=$str; |
|
415 | 415 | return $str; |
416 | 416 | } |
417 | 417 | |
@@ -428,7 +428,7 @@ discard block |
||
428 | 428 | * defers the execution if set to false |
429 | 429 | * @return string |
430 | 430 | */ |
431 | - public function show($element = 'this', $speed = '', $callback = '', $immediatly = false) { |
|
431 | + public function show($element='this', $speed='', $callback='', $immediatly=false) { |
|
432 | 432 | return $this->_showHideWithEffect("show", $element, $speed, $callback, $immediatly); |
433 | 433 | } |
434 | 434 | |
@@ -439,18 +439,18 @@ discard block |
||
439 | 439 | * @param array $options |
440 | 440 | * @return string |
441 | 441 | */ |
442 | - public function sortable($element, $options = array()) { |
|
443 | - if (count($options) > 0) { |
|
444 | - $sort_options = array(); |
|
442 | + public function sortable($element, $options=array()) { |
|
443 | + if (count($options)>0) { |
|
444 | + $sort_options=array(); |
|
445 | 445 | foreach ($options as $k => $v) { |
446 | - $sort_options[] = "\n\t\t" . $k . ': ' . $v . ""; |
|
446 | + $sort_options[]="\n\t\t".$k.': '.$v.""; |
|
447 | 447 | } |
448 | - $sort_options = implode(",", $sort_options); |
|
448 | + $sort_options=implode(",", $sort_options); |
|
449 | 449 | } else { |
450 | - $sort_options = ''; |
|
450 | + $sort_options=''; |
|
451 | 451 | } |
452 | 452 | |
453 | - return "$(" . Javascript::prep_element($element) . ").sortable({" . $sort_options . "\n\t});"; |
|
453 | + return "$(".Javascript::prep_element($element).").sortable({".$sort_options."\n\t});"; |
|
454 | 454 | } |
455 | 455 | |
456 | 456 | /** |
@@ -462,8 +462,8 @@ discard block |
||
462 | 462 | * plugin location |
463 | 463 | * @return string |
464 | 464 | */ |
465 | - public function tablesorter($table = '', $options = '') { |
|
466 | - $this->jquery_code_for_compile[] = "\t$(" . Javascript::prep_element($table) . ").tablesorter($options);\n"; |
|
465 | + public function tablesorter($table='', $options='') { |
|
466 | + $this->jquery_code_for_compile[]="\t$(".Javascript::prep_element($table).").tablesorter($options);\n"; |
|
467 | 467 | } |
468 | 468 | |
469 | 469 | /** |
@@ -475,14 +475,14 @@ discard block |
||
475 | 475 | * @param boolean $immediatly |
476 | 476 | * defers the execution if set to false |
477 | 477 | */ |
478 | - public function condition($condition, $jsCodeIfTrue, $jsCodeIfFalse = null, $immediatly = false) { |
|
479 | - $str = "if(" . $condition . "){" . $jsCodeIfTrue . "}"; |
|
478 | + public function condition($condition, $jsCodeIfTrue, $jsCodeIfFalse=null, $immediatly=false) { |
|
479 | + $str="if(".$condition."){".$jsCodeIfTrue."}"; |
|
480 | 480 | if (isset($jsCodeIfFalse)) { |
481 | - $str .= "else{" . $jsCodeIfFalse . "}"; |
|
481 | + $str.="else{".$jsCodeIfFalse."}"; |
|
482 | 482 | } |
483 | 483 | |
484 | 484 | if ($immediatly) |
485 | - $this->jquery_code_for_compile[] = $str; |
|
485 | + $this->jquery_code_for_compile[]=$str; |
|
486 | 486 | return $str; |
487 | 487 | } |
488 | 488 | |
@@ -497,14 +497,14 @@ discard block |
||
497 | 497 | * @param boolean $immediatly |
498 | 498 | * @return string |
499 | 499 | */ |
500 | - private function _doJQuery($element, $jqueryCall, $param = "", $jsCallback = "", $immediatly = false) { |
|
501 | - $param = Javascript::prep_value($param); |
|
502 | - $callback = ""; |
|
503 | - if ($jsCallback != "") |
|
504 | - $callback = ", function(event){\n{$jsCallback}\n}"; |
|
505 | - $script = "$(" . Javascript::prep_element($element) . ")." . $jqueryCall . "(" . $param . $callback . ");\n"; |
|
500 | + private function _doJQuery($element, $jqueryCall, $param="", $jsCallback="", $immediatly=false) { |
|
501 | + $param=Javascript::prep_value($param); |
|
502 | + $callback=""; |
|
503 | + if ($jsCallback!="") |
|
504 | + $callback=", function(event){\n{$jsCallback}\n}"; |
|
505 | + $script="$(".Javascript::prep_element($element).").".$jqueryCall."(".$param.$callback.");\n"; |
|
506 | 506 | if ($immediatly) |
507 | - $this->jquery_code_for_compile[] = $script; |
|
507 | + $this->jquery_code_for_compile[]=$script; |
|
508 | 508 | return $script; |
509 | 509 | } |
510 | 510 | |
@@ -521,7 +521,7 @@ discard block |
||
521 | 521 | * javascript code to execute after the jquery call |
522 | 522 | * @return mixed |
523 | 523 | */ |
524 | - public function doJQuery($element, $jqueryCall, $param = "", $jsCallback = "") { |
|
524 | + public function doJQuery($element, $jqueryCall, $param="", $jsCallback="") { |
|
525 | 525 | return $this->_doJQuery($element, $jqueryCall, $param, $jsCallback, true); |
526 | 526 | } |
527 | 527 | |
@@ -538,7 +538,7 @@ discard block |
||
538 | 538 | * javascript code to execute after the jquery call |
539 | 539 | * @return mixed |
540 | 540 | */ |
541 | - public function doJQueryDeferred($element, $jqueryCall, $param = "", $jsCallback = "") { |
|
541 | + public function doJQueryDeferred($element, $jqueryCall, $param="", $jsCallback="") { |
|
542 | 542 | return $this->_doJQuery($element, $jqueryCall, $param, $jsCallback, false); |
543 | 543 | } |
544 | 544 | |
@@ -556,7 +556,7 @@ discard block |
||
556 | 556 | * @param boolean $immediatly |
557 | 557 | * @return string |
558 | 558 | */ |
559 | - private function _doJQueryOn($event, $element, $elementToModify, $jqueryCall, $param = "", $preventDefault = false, $stopPropagation = false, $jsCallback = "", $immediatly = true) { |
|
559 | + private function _doJQueryOn($event, $element, $elementToModify, $jqueryCall, $param="", $preventDefault=false, $stopPropagation=false, $jsCallback="", $immediatly=true) { |
|
560 | 560 | return $this->_add_event($element, $this->_doJQuery($elementToModify, $jqueryCall, $param, $jsCallback), $event, $preventDefault, $stopPropagation, $immediatly); |
561 | 561 | } |
562 | 562 | |
@@ -571,11 +571,11 @@ discard block |
||
571 | 571 | * @param array $parameters |
572 | 572 | * default : array("preventDefault"=>false,"stopPropagation"=>false,"jsCallback"=>'',"immediatly"=>true) |
573 | 573 | */ |
574 | - public function doJQueryOn($event, $element, $elementToModify, $jqueryCall, $param = "", $parameters = array()) { |
|
575 | - $jsCallback = ""; |
|
576 | - $stopPropagation = false; |
|
577 | - $preventDefault = false; |
|
578 | - $immediatly = true; |
|
574 | + public function doJQueryOn($event, $element, $elementToModify, $jqueryCall, $param="", $parameters=array()) { |
|
575 | + $jsCallback=""; |
|
576 | + $stopPropagation=false; |
|
577 | + $preventDefault=false; |
|
578 | + $immediatly=true; |
|
579 | 579 | extract($parameters); |
580 | 580 | return $this->_doJQueryOn($event, $element, $elementToModify, $jqueryCall, $param, $preventDefault, $stopPropagation, $jsCallback, $immediatly); |
581 | 581 | } |
@@ -589,10 +589,10 @@ discard block |
||
589 | 589 | * delayed if false |
590 | 590 | * @return String |
591 | 591 | */ |
592 | - public function exec($js, $immediatly = false) { |
|
593 | - $script = $js . "\n"; |
|
592 | + public function exec($js, $immediatly=false) { |
|
593 | + $script=$js."\n"; |
|
594 | 594 | if ($immediatly) |
595 | - $this->jquery_code_for_compile[] = $script; |
|
595 | + $this->jquery_code_for_compile[]=$script; |
|
596 | 596 | return $script; |
597 | 597 | } |
598 | 598 | |
@@ -606,8 +606,8 @@ discard block |
||
606 | 606 | * @return String |
607 | 607 | */ |
608 | 608 | public function execAtLast($js) { |
609 | - $script = $js . "\n"; |
|
610 | - $this->jquery_code_for_compile_at_last[] = $script; |
|
609 | + $script=$js."\n"; |
|
610 | + $this->jquery_code_for_compile_at_last[]=$script; |
|
611 | 611 | return $script; |
612 | 612 | } |
613 | 613 | |
@@ -622,18 +622,18 @@ discard block |
||
622 | 622 | * default : array("preventDefault"=>false,"stopPropagation"=>false,"immediatly"=>true) |
623 | 623 | * @return String |
624 | 624 | */ |
625 | - public function execOn($event, $element, $js, $parameters = array()) { |
|
626 | - $stopPropagation = false; |
|
627 | - $preventDefault = false; |
|
628 | - $immediatly = true; |
|
625 | + public function execOn($event, $element, $js, $parameters=array()) { |
|
626 | + $stopPropagation=false; |
|
627 | + $preventDefault=false; |
|
628 | + $immediatly=true; |
|
629 | 629 | extract($parameters); |
630 | - $script = $this->_add_event($element, $this->exec($js), $event, $preventDefault, $stopPropagation, $immediatly); |
|
630 | + $script=$this->_add_event($element, $this->exec($js), $event, $preventDefault, $stopPropagation, $immediatly); |
|
631 | 631 | return $script; |
632 | 632 | } |
633 | 633 | |
634 | - public function setJsonToElement($json, $elementClass = "_element", $immediatly = true) { |
|
635 | - $retour = "var data={$json};" . "\n\tdata=($.isPlainObject(data))?data:JSON.parse(data);" . "\n\tvar pk=data['pk'];var object=data['object'];" . "\n\tfor(var field in object){" . "\n\tif($('[data-field='+field+']',$('._element[data-ajax='+pk+']')).length){" . "\n\t\t$('[data-field='+field+']',$('._element[data-ajax='+pk+']')).each(function(){" . "\n\t\t\tif($(this).is('[value]')) { $(this).val(object[field]);} else { $(this).html(object[field]); }" . "\n\t});" . "\n}};\n"; |
|
636 | - $retour .= "\t$(document).trigger('jsonReady',[data]);\n"; |
|
634 | + public function setJsonToElement($json, $elementClass="_element", $immediatly=true) { |
|
635 | + $retour="var data={$json};"."\n\tdata=($.isPlainObject(data))?data:JSON.parse(data);"."\n\tvar pk=data['pk'];var object=data['object'];"."\n\tfor(var field in object){"."\n\tif($('[data-field='+field+']',$('._element[data-ajax='+pk+']')).length){"."\n\t\t$('[data-field='+field+']',$('._element[data-ajax='+pk+']')).each(function(){"."\n\t\t\tif($(this).is('[value]')) { $(this).val(object[field]);} else { $(this).html(object[field]); }"."\n\t});"."\n}};\n"; |
|
636 | + $retour.="\t$(document).trigger('jsonReady',[data]);\n"; |
|
637 | 637 | return $this->exec($retour, $immediatly); |
638 | 638 | } |
639 | 639 | |
@@ -645,13 +645,13 @@ discard block |
||
645 | 645 | * @param array $parameters |
646 | 646 | * default : array("attr"=>"id","preventDefault"=>false,"stopPropagation"=>false,"immediatly"=>true) |
647 | 647 | */ |
648 | - public function setDraggable($element, $parameters = []) { |
|
649 | - $attr = "id"; |
|
650 | - $preventDefault = false; |
|
651 | - $stopPropagation = false; |
|
652 | - $immediatly = true; |
|
648 | + public function setDraggable($element, $parameters=[]) { |
|
649 | + $attr="id"; |
|
650 | + $preventDefault=false; |
|
651 | + $stopPropagation=false; |
|
652 | + $immediatly=true; |
|
653 | 653 | extract($parameters); |
654 | - $script = $this->_add_event($element, Javascript::draggable($attr), "dragstart", $preventDefault, $stopPropagation, $immediatly); |
|
654 | + $script=$this->_add_event($element, Javascript::draggable($attr), "dragstart", $preventDefault, $stopPropagation, $immediatly); |
|
655 | 655 | return $script; |
656 | 656 | } |
657 | 657 | |
@@ -665,13 +665,13 @@ discard block |
||
665 | 665 | * @param string $jsCallback |
666 | 666 | * the js script to call when element is dropped |
667 | 667 | */ |
668 | - public function asDropZone($element, $jsCallback = "", $parameters = []) { |
|
669 | - $stopPropagation = false; |
|
670 | - $immediatly = true; |
|
671 | - $jqueryDone = "append"; |
|
672 | - $script = $this->_add_event($element, '', "dragover", true, $stopPropagation, $immediatly); |
|
668 | + public function asDropZone($element, $jsCallback="", $parameters=[]) { |
|
669 | + $stopPropagation=false; |
|
670 | + $immediatly=true; |
|
671 | + $jqueryDone="append"; |
|
672 | + $script=$this->_add_event($element, '', "dragover", true, $stopPropagation, $immediatly); |
|
673 | 673 | extract($parameters); |
674 | - $script .= $this->_add_event($element, Javascript::dropZone($jqueryDone, $jsCallback), "drop", true, $stopPropagation, $immediatly); |
|
674 | + $script.=$this->_add_event($element, Javascript::dropZone($jqueryDone, $jsCallback), "drop", true, $stopPropagation, $immediatly); |
|
675 | 675 | return $script; |
676 | 676 | } |
677 | 677 | |
@@ -688,14 +688,14 @@ discard block |
||
688 | 688 | * delayed if false |
689 | 689 | * @return string |
690 | 690 | */ |
691 | - public function interval($jsCode, $time, $globalName = null, $immediatly = true) { |
|
692 | - if (! Javascript::isFunction($jsCode)) { |
|
693 | - $jsCode = "function(){\n" . $jsCode . "\n}"; |
|
691 | + public function interval($jsCode, $time, $globalName=null, $immediatly=true) { |
|
692 | + if (!Javascript::isFunction($jsCode)) { |
|
693 | + $jsCode="function(){\n".$jsCode."\n}"; |
|
694 | 694 | } |
695 | 695 | if (isset($globalName)) { |
696 | - $script = "if(window.{$globalName}){clearInterval(window.{$globalName});}\nwindow.{$globalName}=setInterval({$jsCode},{$time});"; |
|
696 | + $script="if(window.{$globalName}){clearInterval(window.{$globalName});}\nwindow.{$globalName}=setInterval({$jsCode},{$time});"; |
|
697 | 697 | } else { |
698 | - $script = "setInterval({$jsCode},{$time});"; |
|
698 | + $script="setInterval({$jsCode},{$time});"; |
|
699 | 699 | } |
700 | 700 | return $this->exec($script, $immediatly); |
701 | 701 | } |
@@ -709,7 +709,7 @@ discard block |
||
709 | 709 | * delayed if false |
710 | 710 | * @return string |
711 | 711 | */ |
712 | - public function clearInterval($globalName, $immediatly = true) { |
|
712 | + public function clearInterval($globalName, $immediatly=true) { |
|
713 | 713 | return $this->exec("if(window.{$globalName}){clearInterval(window.{$globalName});}", $immediatly); |
714 | 714 | } |
715 | 715 | |
@@ -731,20 +731,20 @@ discard block |
||
731 | 731 | * delayed if false |
732 | 732 | * @return string |
733 | 733 | */ |
734 | - public function counter($counterSelector, $value = 0, $limit = 0, $globalName = null, $countDown = true, $immediatly = true) { |
|
735 | - $stop = ""; |
|
734 | + public function counter($counterSelector, $value=0, $limit=0, $globalName=null, $countDown=true, $immediatly=true) { |
|
735 | + $stop=""; |
|
736 | 736 | if ($countDown) { |
737 | - $stop = "if (--timer < " . $limit . ") {clearInterval(interval);display.trigger({type:'counter-end',value: timer,limit:" . $limit . "});}"; |
|
737 | + $stop="if (--timer < ".$limit.") {clearInterval(interval);display.trigger({type:'counter-end',value: timer,limit:".$limit."});}"; |
|
738 | 738 | } else { |
739 | - if ($limit != 0) { |
|
740 | - $stop = "if (++timer > " . $limit . ") {clearInterval(interval);display.trigger({type:'counter-end',value: timer,limit:" . $limit . "});}"; |
|
739 | + if ($limit!=0) { |
|
740 | + $stop="if (++timer > ".$limit.") {clearInterval(interval);display.trigger({type:'counter-end',value: timer,limit:".$limit."});}"; |
|
741 | 741 | } |
742 | 742 | } |
743 | - $global = ""; |
|
743 | + $global=""; |
|
744 | 744 | if (isset($globalName)) { |
745 | - $global = "\nwindow.{$globalName}=interval;"; |
|
745 | + $global="\nwindow.{$globalName}=interval;"; |
|
746 | 746 | } |
747 | - $timer = "var startTimer=function(duration, display) {var timer = duration, days, hours, minutes, seconds; |
|
747 | + $timer="var startTimer=function(duration, display) {var timer = duration, days, hours, minutes, seconds; |
|
748 | 748 | var sh=function(disp,v){if(disp.is('[value]')){disp.val(v);} else {disp.html(v);};}; |
749 | 749 | var shHide=function(v,k,kBefore){if(v==0 && display.find(k).closest('.timer').is(':visible') && (!kBefore || !display.find(kBefore).closest('.timer').is(':visible'))){display.find(k).closest('.timer').hide();}else{sh(display.find(k),v);}}; |
750 | 750 | var pl=function(v,text){return (v>1)?v+' '+text+'s':(v>0)?v+' '+text:'';}; |
@@ -760,12 +760,12 @@ discard block |
||
760 | 760 | minutes = d0(parseInt((timer%3600) / 60, 10)); |
761 | 761 | seconds = d0(parseInt(timer%60, 10)); |
762 | 762 | mainSh(days,hours,minutes,seconds); |
763 | - " . $stop . " |
|
763 | + " . $stop." |
|
764 | 764 | }, 1000); |
765 | - " . $global . " |
|
765 | + " . $global." |
|
766 | 766 | }"; |
767 | - $element = '$("' . $counterSelector . '")'; |
|
768 | - return $this->exec($timer . "\nstartTimer(" . $value . "," . $element . ");", $immediatly); |
|
767 | + $element='$("'.$counterSelector.'")'; |
|
768 | + return $this->exec($timer."\nstartTimer(".$value.",".$element.");", $immediatly); |
|
769 | 769 | } |
770 | 770 | |
771 | 771 | /** |
@@ -787,7 +787,7 @@ discard block |
||
787 | 787 | * count down if true or elapse if false |
788 | 788 | * @return string |
789 | 789 | */ |
790 | - public function counterOn($element, $event, $counterSelector, $value = 0, $limit = 0, $globalName = null, $countDown = true) { |
|
790 | + public function counterOn($element, $event, $counterSelector, $value=0, $limit=0, $globalName=null, $countDown=true) { |
|
791 | 791 | return $this->execOn($event, $element, $this->counter($counterSelector, $value, $limit, $globalName, $countDown, false)); |
792 | 792 | } |
793 | 793 | |
@@ -802,7 +802,7 @@ discard block |
||
802 | 802 | * the active href (if null, window.location.href is used) |
803 | 803 | * @return string |
804 | 804 | */ |
805 | - public function activateLink($target, $property = 'href', $href = null) { |
|
805 | + public function activateLink($target, $property='href', $href=null) { |
|
806 | 806 | return $this->execAtLast($this->_activateLink($target, $property, $href)); |
807 | 807 | } |
808 | 808 | |
@@ -817,14 +817,14 @@ discard block |
||
817 | 817 | * the active href (if null, window.location.href is used) |
818 | 818 | * @return string |
819 | 819 | */ |
820 | - public function _activateLink($target, $property = 'href', $href = null) { |
|
821 | - $js = '$("' . $target . ' [' . $property . ']").removeClass("active");'; |
|
820 | + public function _activateLink($target, $property='href', $href=null) { |
|
821 | + $js='$("'.$target.' ['.$property.']").removeClass("active");'; |
|
822 | 822 | if (isset($href)) { |
823 | - $js .= 'var href="' . $href . '";'; |
|
823 | + $js.='var href="'.$href.'";'; |
|
824 | 824 | } else { |
825 | - $js .= 'var href=window.location.href;'; |
|
825 | + $js.='var href=window.location.href;'; |
|
826 | 826 | } |
827 | - $js .= '$("' . $target . ' [' . $property . ']").each(function(){if(href.includes($(this).attr("' . $property . '"))) $(this).addClass("active");});'; |
|
827 | + $js.='$("'.$target.' ['.$property.']").each(function(){if(href.includes($(this).attr("'.$property.'"))) $(this).addClass("active");});'; |
|
828 | 828 | return $js; |
829 | 829 | } |
830 | 830 | } |