phpMv /
phpMv-UI
@@ -11,7 +11,7 @@ discard block |
||
| 11 | 11 | * @property array $jquery_code_for_compile_at_last |
| 12 | 12 | */ |
| 13 | 13 | trait JsUtilsActionsTrait { |
| 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 | |
@@ -46,14 +46,14 @@ discard block |
||
| 46 | 46 | * @return string |
| 47 | 47 | */ |
| 48 | 48 | private function _validate_speed($speed) { |
| 49 | - if (in_array ( $speed, array ( |
|
| 49 | + if (in_array($speed, array( |
|
| 50 | 50 | 'slow', |
| 51 | 51 | 'normal', |
| 52 | 52 | 'fast' |
| 53 | - ) )) { |
|
| 54 | - $speed = '"' . $speed . '"'; |
|
| 55 | - } elseif (preg_match ( "/[^0-9]/", $speed )) { |
|
| 56 | - $speed = ''; |
|
| 53 | + ))) { |
|
| 54 | + $speed='"'.$speed.'"'; |
|
| 55 | + } elseif (preg_match("/[^0-9]/", $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 ); |
|
| 73 | - if (isset ( $param )) { |
|
| 74 | - $param = Javascript::prep_value ( $param ); |
|
| 75 | - $str = "$({$element}).{$jQueryCall}({$param});"; |
|
| 71 | + public function _genericCallValue($jQueryCall, $element='this', $param="", $immediatly=false) { |
|
| 72 | + $element=Javascript::prep_element($element); |
|
| 73 | + if (isset ($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,8 +109,8 @@ 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) { |
|
| 113 | - return $this->_genericCallValue ( 'addClass', $element, $class, $immediatly ); |
|
| 112 | + public function addClass($element='this', $class='', $immediatly=false) { |
|
| 113 | + return $this->_genericCallValue('addClass', $element, $class, $immediatly); |
|
| 114 | 114 | } |
| 115 | 115 | |
| 116 | 116 | /** |
@@ -122,8 +122,8 @@ 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) { |
|
| 126 | - return $this->_genericCallElement ( 'after', $to, $element, $immediatly ); |
|
| 125 | + public function after($to, $element, $immediatly=false) { |
|
| 126 | + return $this->_genericCallElement('after', $to, $element, $immediatly); |
|
| 127 | 127 | } |
| 128 | 128 | |
| 129 | 129 | /** |
@@ -135,8 +135,8 @@ 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) { |
|
| 139 | - return $this->_genericCallElement ( 'before', $to, $element, $immediatly ); |
|
| 138 | + public function before($to, $element, $immediatly=false) { |
|
| 139 | + return $this->_genericCallElement('before', $to, $element, $immediatly); |
|
| 140 | 140 | } |
| 141 | 141 | |
| 142 | 142 | /** |
@@ -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 = 'id', $value = "", $immediatly = false) { |
|
| 152 | - $element = Javascript::prep_element ( $element ); |
|
| 153 | - if (isset ( $value )) { |
|
| 154 | - $value = Javascript::prep_value ( $value ); |
|
| 155 | - $str = "$({$element}).attr(\"$attributeName\",{$value});"; |
|
| 151 | + public function attr($element='this', $attributeName='id', $value="", $immediatly=false) { |
|
| 152 | + $element=Javascript::prep_element($element); |
|
| 153 | + if (isset ($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,8 +168,8 @@ 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) { |
|
| 172 | - return $this->_genericCallValue ( 'val', $element, $value, $immediatly ); |
|
| 171 | + public function val($element='this', $value='', $immediatly=false) { |
|
| 172 | + return $this->_genericCallValue('val', $element, $value, $immediatly); |
|
| 173 | 173 | } |
| 174 | 174 | |
| 175 | 175 | /** |
@@ -180,8 +180,8 @@ 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) { |
|
| 184 | - return $this->_genericCallValue ( 'html', $element, $value, $immediatly ); |
|
| 183 | + public function html($element='this', $value='', $immediatly=false) { |
|
| 184 | + return $this->_genericCallValue('html', $element, $value, $immediatly); |
|
| 185 | 185 | } |
| 186 | 186 | |
| 187 | 187 | /** |
@@ -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"; |
|
| 205 | - if (\is_array ( $params )) { |
|
| 206 | - foreach ( $params as $param => $value ) { |
|
| 207 | - $animations .= $param . ': \'' . $value . '\', '; |
|
| 204 | + $animations="\t\t\t"; |
|
| 205 | + if (\is_array($params)) { |
|
| 206 | + foreach ($params as $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,8 +233,8 @@ 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) { |
|
| 237 | - return $this->_genericCallElement ( 'append', $to, $element, $immediatly ); |
|
| 236 | + public function append($to, $element, $immediatly=false) { |
|
| 237 | + return $this->_genericCallElement('append', $to, $element, $immediatly); |
|
| 238 | 238 | } |
| 239 | 239 | |
| 240 | 240 | /** |
@@ -246,8 +246,8 @@ 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) { |
|
| 250 | - return $this->_genericCallElement ( 'prepend', $to, $element, $immediatly ); |
|
| 249 | + public function prepend($to, $element, $immediatly=false) { |
|
| 250 | + return $this->_genericCallElement('prepend', $to, $element, $immediatly); |
|
| 251 | 251 | } |
| 252 | 252 | |
| 253 | 253 | /** |
@@ -263,8 +263,8 @@ 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) { |
|
| 267 | - return $this->_showHideWithEffect ( "fadeIn", $element, $speed, $callback, $immediatly ); |
|
| 266 | + public function fadeIn($element='this', $speed='', $callback='', $immediatly=false) { |
|
| 267 | + return $this->_showHideWithEffect("fadeIn", $element, $speed, $callback, $immediatly); |
|
| 268 | 268 | } |
| 269 | 269 | |
| 270 | 270 | /** |
@@ -280,8 +280,8 @@ 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) { |
|
| 284 | - return $this->_showHideWithEffect ( "fadeOut", $element, $speed, $callback, $immediatly ); |
|
| 283 | + public function fadeOut($element='this', $speed='', $callback='', $immediatly=false) { |
|
| 284 | + return $this->_showHideWithEffect("fadeOut", $element, $speed, $callback, $immediatly); |
|
| 285 | 285 | } |
| 286 | 286 | |
| 287 | 287 | /** |
@@ -297,8 +297,8 @@ 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) { |
|
| 301 | - return $this->_showHideWithEffect ( "slideUp", $element, $speed, $callback, $immediatly ); |
|
| 300 | + public function slideUp($element='this', $speed='', $callback='', $immediatly=false) { |
|
| 301 | + return $this->_showHideWithEffect("slideUp", $element, $speed, $callback, $immediatly); |
|
| 302 | 302 | } |
| 303 | 303 | |
| 304 | 304 | /** |
@@ -312,8 +312,8 @@ 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) { |
|
| 316 | - return $this->_genericCallValue ( 'removeClass', $element, $class, $immediatly ); |
|
| 315 | + public function removeClass($element='this', $class='', $immediatly=false) { |
|
| 316 | + return $this->_genericCallValue('removeClass', $element, $class, $immediatly); |
|
| 317 | 317 | } |
| 318 | 318 | |
| 319 | 319 | /** |
@@ -329,8 +329,8 @@ 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) { |
|
| 333 | - return $this->_showHideWithEffect ( "slideDown", $element, $speed, $callback, $immediatly ); |
|
| 332 | + public function slideDown($element='this', $speed='', $callback='', $immediatly=false) { |
|
| 333 | + return $this->_showHideWithEffect("slideDown", $element, $speed, $callback, $immediatly); |
|
| 334 | 334 | } |
| 335 | 335 | |
| 336 | 336 | /** |
@@ -346,8 +346,8 @@ 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) { |
|
| 350 | - return $this->_showHideWithEffect ( "slideToggle", $element, $speed, $callback, $immediatly ); |
|
| 349 | + public function slideToggle($element='this', $speed='', $callback='', $immediatly=false) { |
|
| 350 | + return $this->_showHideWithEffect("slideToggle", $element, $speed, $callback, $immediatly); |
|
| 351 | 351 | } |
| 352 | 352 | |
| 353 | 353 | /** |
@@ -363,8 +363,8 @@ 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) { |
|
| 367 | - return $this->_showHideWithEffect ( "hide", $element, $speed, $callback, $immediatly ); |
|
| 366 | + public function hide($element='this', $speed='', $callback='', $immediatly=false) { |
|
| 367 | + return $this->_showHideWithEffect("hide", $element, $speed, $callback, $immediatly); |
|
| 368 | 368 | } |
| 369 | 369 | |
| 370 | 370 | /** |
@@ -380,8 +380,8 @@ 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) { |
|
| 384 | - return $this->_showHideWithEffect ( "toggle", $element, $speed, $callback, $immediatly ); |
|
| 383 | + public function toggle($element='this', $speed='', $callback='', $immediatly=false) { |
|
| 384 | + return $this->_showHideWithEffect("toggle", $element, $speed, $callback, $immediatly); |
|
| 385 | 385 | } |
| 386 | 386 | |
| 387 | 387 | /** |
@@ -394,8 +394,8 @@ 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) { |
|
| 398 | - return $this->_genericCallValue ( 'toggleClass', $element, $class, $immediatly ); |
|
| 397 | + public function toggleClass($element='this', $class='', $immediatly=false) { |
|
| 398 | + return $this->_genericCallValue('toggleClass', $element, $class, $immediatly); |
|
| 399 | 399 | } |
| 400 | 400 | |
| 401 | 401 | /** |
@@ -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,8 +428,8 @@ 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) { |
|
| 432 | - return $this->_showHideWithEffect ( "show", $element, $speed, $callback, $immediatly ); |
|
| 431 | + public function show($element='this', $speed='', $callback='', $immediatly=false) { |
|
| 432 | + return $this->_showHideWithEffect("show", $element, $speed, $callback, $immediatly); |
|
| 433 | 433 | } |
| 434 | 434 | |
| 435 | 435 | /** |
@@ -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 (); |
|
| 445 | - foreach ( $options as $k => $v ) { |
|
| 446 | - $sort_options [] = "\n\t\t" . $k . ': ' . $v . ""; |
|
| 442 | + public function sortable($element, $options=array()) { |
|
| 443 | + if (count($options)>0) { |
|
| 444 | + $sort_options=array(); |
|
| 445 | + foreach ($options as $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 . "}"; |
|
| 480 | - if (isset ( $jsCodeIfFalse )) { |
|
| 481 | - $str .= "else{" . $jsCodeIfFalse . "}"; |
|
| 478 | + public function condition($condition, $jsCodeIfTrue, $jsCodeIfFalse=null, $immediatly=false) { |
|
| 479 | + $str="if(".$condition."){".$jsCodeIfTrue."}"; |
|
| 480 | + if (isset ($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,8 +521,8 @@ 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 = "") { |
|
| 525 | - return $this->_doJQuery ( $element, $jqueryCall, $param, $jsCallback, true ); |
|
| 524 | + public function doJQuery($element, $jqueryCall, $param="", $jsCallback="") { |
|
| 525 | + return $this->_doJQuery($element, $jqueryCall, $param, $jsCallback, true); |
|
| 526 | 526 | } |
| 527 | 527 | |
| 528 | 528 | /** |
@@ -538,8 +538,8 @@ 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 = "") { |
|
| 542 | - return $this->_doJQuery ( $element, $jqueryCall, $param, $jsCallback, false ); |
|
| 541 | + public function doJQueryDeferred($element, $jqueryCall, $param="", $jsCallback="") { |
|
| 542 | + return $this->_doJQuery($element, $jqueryCall, $param, $jsCallback, false); |
|
| 543 | 543 | } |
| 544 | 544 | |
| 545 | 545 | /** |
@@ -556,8 +556,8 @@ 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) { |
|
| 560 | - return $this->_add_event ( $element, $this->_doJQuery ( $elementToModify, $jqueryCall, $param, $jsCallback ), $event, $preventDefault, $stopPropagation, $immediatly ); |
|
| 559 | + private function _doJQueryOn($event, $element, $elementToModify, $jqueryCall, $param="", $preventDefault=false, $stopPropagation=false, $jsCallback="", $immediatly=true) { |
|
| 560 | + return $this->_add_event($element, $this->_doJQuery($elementToModify, $jqueryCall, $param, $jsCallback), $event, $preventDefault, $stopPropagation, $immediatly); |
|
| 561 | 561 | } |
| 562 | 562 | |
| 563 | 563 | /** |
@@ -571,13 +571,13 @@ 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; |
|
| 579 | - extract ( $parameters ); |
|
| 580 | - return $this->_doJQueryOn ( $event, $element, $elementToModify, $jqueryCall, $param, $preventDefault, $stopPropagation, $jsCallback, $immediatly ); |
|
| 574 | + public function doJQueryOn($event, $element, $elementToModify, $jqueryCall, $param="", $parameters=array()) { |
|
| 575 | + $jsCallback=""; |
|
| 576 | + $stopPropagation=false; |
|
| 577 | + $preventDefault=false; |
|
| 578 | + $immediatly=true; |
|
| 579 | + extract($parameters); |
|
| 580 | + return $this->_doJQueryOn($event, $element, $elementToModify, $jqueryCall, $param, $preventDefault, $stopPropagation, $jsCallback, $immediatly); |
|
| 581 | 581 | } |
| 582 | 582 | |
| 583 | 583 | /** |
@@ -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; |
|
| 629 | - extract ( $parameters ); |
|
| 630 | - $script = $this->_add_event ( $element, $this->exec ( $js ), $event, $preventDefault, $stopPropagation, $immediatly ); |
|
| 625 | + public function execOn($event, $element, $js, $parameters=array()) { |
|
| 626 | + $stopPropagation=false; |
|
| 627 | + $preventDefault=false; |
|
| 628 | + $immediatly=true; |
|
| 629 | + extract($parameters); |
|
| 630 | + $script=$this->_add_event($element, $this->exec($js), $event, $preventDefault, $stopPropagation, $immediatly); |
|
| 631 | 631 | return $script; |
| 632 | 632 | } |
| 633 | - public function setJsonToElement($json, $elementClass = "_element", $immediatly = true) { |
|
| 634 | - $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"; |
|
| 635 | - $retour .= "\t$(document).trigger('jsonReady',[data]);\n"; |
|
| 636 | - return $this->exec ( $retour, $immediatly ); |
|
| 633 | + public function setJsonToElement($json, $elementClass="_element", $immediatly=true) { |
|
| 634 | + $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"; |
|
| 635 | + $retour.="\t$(document).trigger('jsonReady',[data]);\n"; |
|
| 636 | + return $this->exec($retour, $immediatly); |
|
| 637 | 637 | } |
| 638 | 638 | |
| 639 | 639 | /** |
@@ -644,13 +644,13 @@ discard block |
||
| 644 | 644 | * @param array $parameters |
| 645 | 645 | * default : array("attr"=>"id","preventDefault"=>false,"stopPropagation"=>false,"immediatly"=>true) |
| 646 | 646 | */ |
| 647 | - public function setDraggable($element, $parameters = [ ]) { |
|
| 648 | - $attr = "id"; |
|
| 649 | - $preventDefault = false; |
|
| 650 | - $stopPropagation = false; |
|
| 651 | - $immediatly = true; |
|
| 652 | - extract ( $parameters ); |
|
| 653 | - $script = $this->_add_event ( $element, Javascript::draggable ( $attr ), "dragstart", $preventDefault, $stopPropagation, $immediatly ); |
|
| 647 | + public function setDraggable($element, $parameters=[]) { |
|
| 648 | + $attr="id"; |
|
| 649 | + $preventDefault=false; |
|
| 650 | + $stopPropagation=false; |
|
| 651 | + $immediatly=true; |
|
| 652 | + extract($parameters); |
|
| 653 | + $script=$this->_add_event($element, Javascript::draggable($attr), "dragstart", $preventDefault, $stopPropagation, $immediatly); |
|
| 654 | 654 | return $script; |
| 655 | 655 | } |
| 656 | 656 | |
@@ -664,13 +664,13 @@ discard block |
||
| 664 | 664 | * @param string $jsCallback |
| 665 | 665 | * the js script to call when element is dropped |
| 666 | 666 | */ |
| 667 | - public function asDropZone($element, $jsCallback = "", $parameters = [ ]) { |
|
| 668 | - $stopPropagation = false; |
|
| 669 | - $immediatly = true; |
|
| 670 | - $jqueryDone = "append"; |
|
| 671 | - $script = $this->_add_event ( $element, '', "dragover", true, $stopPropagation, $immediatly ); |
|
| 672 | - extract ( $parameters ); |
|
| 673 | - $script .= $this->_add_event ( $element, Javascript::dropZone ( $jqueryDone, $jsCallback ), "drop", true, $stopPropagation, $immediatly ); |
|
| 667 | + public function asDropZone($element, $jsCallback="", $parameters=[]) { |
|
| 668 | + $stopPropagation=false; |
|
| 669 | + $immediatly=true; |
|
| 670 | + $jqueryDone="append"; |
|
| 671 | + $script=$this->_add_event($element, '', "dragover", true, $stopPropagation, $immediatly); |
|
| 672 | + extract($parameters); |
|
| 673 | + $script.=$this->_add_event($element, Javascript::dropZone($jqueryDone, $jsCallback), "drop", true, $stopPropagation, $immediatly); |
|
| 674 | 674 | return $script; |
| 675 | 675 | } |
| 676 | 676 | |
@@ -687,16 +687,16 @@ discard block |
||
| 687 | 687 | * delayed if false |
| 688 | 688 | * @return string |
| 689 | 689 | */ |
| 690 | - public function interval($jsCode, $time, $globalName = null, $immediatly = true) { |
|
| 691 | - if (! Javascript::isFunction ( $jsCode )) { |
|
| 692 | - $jsCode = "function(){\n" . $jsCode . "\n}"; |
|
| 690 | + public function interval($jsCode, $time, $globalName=null, $immediatly=true) { |
|
| 691 | + if (!Javascript::isFunction($jsCode)) { |
|
| 692 | + $jsCode="function(){\n".$jsCode."\n}"; |
|
| 693 | 693 | } |
| 694 | - if (isset ( $globalName )) { |
|
| 695 | - $script = "if(window.{$globalName}){clearInterval(window.{$globalName});}\nwindow.{$globalName}=setInterval({$jsCode},{$time});"; |
|
| 694 | + if (isset ($globalName)) { |
|
| 695 | + $script="if(window.{$globalName}){clearInterval(window.{$globalName});}\nwindow.{$globalName}=setInterval({$jsCode},{$time});"; |
|
| 696 | 696 | } else { |
| 697 | - $script = "setInterval({$jsCode},{$time});"; |
|
| 697 | + $script="setInterval({$jsCode},{$time});"; |
|
| 698 | 698 | } |
| 699 | - return $this->exec ( $script, $immediatly ); |
|
| 699 | + return $this->exec($script, $immediatly); |
|
| 700 | 700 | } |
| 701 | 701 | |
| 702 | 702 | /** |
@@ -708,8 +708,8 @@ discard block |
||
| 708 | 708 | * delayed if false |
| 709 | 709 | * @return string |
| 710 | 710 | */ |
| 711 | - public function clearInterval($globalName, $immediatly = true) { |
|
| 712 | - return $this->exec ( "if(window.{$globalName}){clearInterval(window.{$globalName});}", $immediatly ); |
|
| 711 | + public function clearInterval($globalName, $immediatly=true) { |
|
| 712 | + return $this->exec("if(window.{$globalName}){clearInterval(window.{$globalName});}", $immediatly); |
|
| 713 | 713 | } |
| 714 | 714 | |
| 715 | 715 | /** |
@@ -730,20 +730,20 @@ discard block |
||
| 730 | 730 | * delayed if false |
| 731 | 731 | * @return string |
| 732 | 732 | */ |
| 733 | - public function counter($counterSelector, $value = 0, $limit = 0, $globalName = null, $countDown = true, $immediatly = true) { |
|
| 734 | - $stop = ""; |
|
| 733 | + public function counter($counterSelector, $value=0, $limit=0, $globalName=null, $countDown=true, $immediatly=true) { |
|
| 734 | + $stop=""; |
|
| 735 | 735 | if ($countDown) { |
| 736 | - $stop = "if (--timer < " . $limit . ") {clearInterval(interval);display.trigger({type:'counter-end',value: timer,limit:" . $limit . "});}"; |
|
| 736 | + $stop="if (--timer < ".$limit.") {clearInterval(interval);display.trigger({type:'counter-end',value: timer,limit:".$limit."});}"; |
|
| 737 | 737 | } else { |
| 738 | - if ($limit != 0) { |
|
| 739 | - $stop = "if (++timer > " . $limit . ") {clearInterval(interval);display.trigger({type:'counter-end',value: timer,limit:" . $limit . "});}"; |
|
| 738 | + if ($limit!=0) { |
|
| 739 | + $stop="if (++timer > ".$limit.") {clearInterval(interval);display.trigger({type:'counter-end',value: timer,limit:".$limit."});}"; |
|
| 740 | 740 | } |
| 741 | 741 | } |
| 742 | - $global = ""; |
|
| 743 | - if (isset ( $globalName )) { |
|
| 744 | - $global = "\nwindow.{$globalName}=interval;"; |
|
| 742 | + $global=""; |
|
| 743 | + if (isset ($globalName)) { |
|
| 744 | + $global="\nwindow.{$globalName}=interval;"; |
|
| 745 | 745 | } |
| 746 | - $timer = "var startTimer=function(duration, display) {var timer = duration, days, hours, minutes, seconds; |
|
| 746 | + $timer="var startTimer=function(duration, display) {var timer = duration, days, hours, minutes, seconds; |
|
| 747 | 747 | var sh=function(disp,v){if(disp.is('[value]')){disp.val(v);} else {disp.html(v);};}; |
| 748 | 748 | 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);}}; |
| 749 | 749 | var pl=function(v,text){return (v>1)?v+' '+text+'s':(v>0)?v+' '+text:'';}; |
@@ -759,12 +759,12 @@ discard block |
||
| 759 | 759 | minutes = d0(parseInt((timer%3600) / 60, 10)); |
| 760 | 760 | seconds = d0(parseInt(timer%60, 10)); |
| 761 | 761 | mainSh(days,hours,minutes,seconds); |
| 762 | - " . $stop . " |
|
| 762 | + " . $stop." |
|
| 763 | 763 | }, 1000); |
| 764 | - " . $global . " |
|
| 764 | + " . $global." |
|
| 765 | 765 | }"; |
| 766 | - $element = '$("' . $counterSelector . '")'; |
|
| 767 | - return $this->exec ( $timer . "\nstartTimer(" . $value . "," . $element . ");", $immediatly ); |
|
| 766 | + $element='$("'.$counterSelector.'")'; |
|
| 767 | + return $this->exec($timer."\nstartTimer(".$value.",".$element.");", $immediatly); |
|
| 768 | 768 | } |
| 769 | 769 | |
| 770 | 770 | /** |
@@ -786,8 +786,8 @@ discard block |
||
| 786 | 786 | * count down if true or elapse if false |
| 787 | 787 | * @return string |
| 788 | 788 | */ |
| 789 | - public function counterOn($element, $event, $counterSelector, $value = 0, $limit = 0, $globalName = null, $countDown = true) { |
|
| 790 | - return $this->execOn ( $event, $element, $this->counter ( $counterSelector, $value, $limit, $globalName, $countDown, false ) ); |
|
| 789 | + public function counterOn($element, $event, $counterSelector, $value=0, $limit=0, $globalName=null, $countDown=true) { |
|
| 790 | + return $this->execOn($event, $element, $this->counter($counterSelector, $value, $limit, $globalName, $countDown, false)); |
|
| 791 | 791 | } |
| 792 | 792 | |
| 793 | 793 | /** |
@@ -801,8 +801,8 @@ discard block |
||
| 801 | 801 | * the active href (if null, window.location.href is used) |
| 802 | 802 | * @return string |
| 803 | 803 | */ |
| 804 | - public function activateLink($target, $property = 'href', $href = null) { |
|
| 805 | - return $this->execAtLast ( $this->_activateLink ( $target, $property, $href ) ); |
|
| 804 | + public function activateLink($target, $property='href', $href=null) { |
|
| 805 | + return $this->execAtLast($this->_activateLink($target, $property, $href)); |
|
| 806 | 806 | } |
| 807 | 807 | |
| 808 | 808 | /** |
@@ -816,14 +816,14 @@ discard block |
||
| 816 | 816 | * the active href (if null, window.location.href is used) |
| 817 | 817 | * @return string |
| 818 | 818 | */ |
| 819 | - public function _activateLink($target, $property = 'href', $href = null) { |
|
| 820 | - $js = '$("' . $target . ' [' . $property . ']").removeClass("active");'; |
|
| 821 | - if (isset ( $href )) { |
|
| 822 | - $js .= 'var href="' . $href . '";'; |
|
| 819 | + public function _activateLink($target, $property='href', $href=null) { |
|
| 820 | + $js='$("'.$target.' ['.$property.']").removeClass("active");'; |
|
| 821 | + if (isset ($href)) { |
|
| 822 | + $js.='var href="'.$href.'";'; |
|
| 823 | 823 | } else { |
| 824 | - $js .= 'var href=window.location.href;'; |
|
| 824 | + $js.='var href=window.location.href;'; |
|
| 825 | 825 | } |
| 826 | - $js .= '$("' . $target . ' [' . $property . ']").each(function(){if(href.includes($(this).attr("' . $property . '"))) $(this).addClass("active");});'; |
|
| 826 | + $js.='$("'.$target.' ['.$property.']").each(function(){if(href.includes($(this).attr("'.$property.'"))) $(this).addClass("active");});'; |
|
| 827 | 827 | return $js; |
| 828 | 828 | } |
| 829 | 829 | } |
@@ -34,8 +34,9 @@ discard block |
||
| 34 | 34 | $callback = ", function(){\n{$callback}\n}"; |
| 35 | 35 | } |
| 36 | 36 | $str = "$({$element}).{$action}({$speed}{$callback});"; |
| 37 | - if ($immediatly) |
|
| 38 | - $this->jquery_code_for_compile [] = $str; |
|
| 37 | + if ($immediatly) { |
|
| 38 | + $this->jquery_code_for_compile [] = $str; |
|
| 39 | + } |
|
| 39 | 40 | return $str; |
| 40 | 41 | } |
| 41 | 42 | |
@@ -73,10 +74,12 @@ discard block |
||
| 73 | 74 | if (isset ( $param )) { |
| 74 | 75 | $param = Javascript::prep_value ( $param ); |
| 75 | 76 | $str = "$({$element}).{$jQueryCall}({$param});"; |
| 76 | - } else |
|
| 77 | - $str = "$({$element}).{$jQueryCall}();"; |
|
| 78 | - if ($immediatly) |
|
| 79 | - $this->jquery_code_for_compile [] = $str; |
|
| 77 | + } else { |
|
| 78 | + $str = "$({$element}).{$jQueryCall}();"; |
|
| 79 | + } |
|
| 80 | + if ($immediatly) { |
|
| 81 | + $this->jquery_code_for_compile [] = $str; |
|
| 82 | + } |
|
| 80 | 83 | return $str; |
| 81 | 84 | } |
| 82 | 85 | |
@@ -94,8 +97,9 @@ discard block |
||
| 94 | 97 | $to = Javascript::prep_element ( $to ); |
| 95 | 98 | $element = Javascript::prep_element ( $element ); |
| 96 | 99 | $str = "$({$to}).{$jQueryCall}({$element});"; |
| 97 | - if ($immediatly) |
|
| 98 | - $this->jquery_code_for_compile [] = $str; |
|
| 100 | + if ($immediatly) { |
|
| 101 | + $this->jquery_code_for_compile [] = $str; |
|
| 102 | + } |
|
| 99 | 103 | return $str; |
| 100 | 104 | } |
| 101 | 105 | |
@@ -153,10 +157,12 @@ discard block |
||
| 153 | 157 | if (isset ( $value )) { |
| 154 | 158 | $value = Javascript::prep_value ( $value ); |
| 155 | 159 | $str = "$({$element}).attr(\"$attributeName\",{$value});"; |
| 156 | - } else |
|
| 157 | - $str = "$({$element}).attr(\"$attributeName\");"; |
|
| 158 | - if ($immediatly) |
|
| 159 | - $this->jquery_code_for_compile [] = $str; |
|
| 160 | + } else { |
|
| 161 | + $str = "$({$element}).attr(\"$attributeName\");"; |
|
| 162 | + } |
|
| 163 | + if ($immediatly) { |
|
| 164 | + $this->jquery_code_for_compile [] = $str; |
|
| 165 | + } |
|
| 160 | 166 | return $str; |
| 161 | 167 | } |
| 162 | 168 | |
@@ -219,8 +225,9 @@ discard block |
||
| 219 | 225 | |
| 220 | 226 | $str = "$({$element}).animate({\n$animations\n\t\t}" . $speed . $extra . ");"; |
| 221 | 227 | |
| 222 | - if ($immediatly) |
|
| 223 | - $this->jquery_code_for_compile [] = $str; |
|
| 228 | + if ($immediatly) { |
|
| 229 | + $this->jquery_code_for_compile [] = $str; |
|
| 230 | + } |
|
| 224 | 231 | return $str; |
| 225 | 232 | } |
| 226 | 233 | |
@@ -410,8 +417,9 @@ discard block |
||
| 410 | 417 | $element = Javascript::prep_element ( $element ); |
| 411 | 418 | $str = "$({$element}).trigger(\"$event\");"; |
| 412 | 419 | |
| 413 | - if ($immediatly) |
|
| 414 | - $this->jquery_code_for_compile [] = $str; |
|
| 420 | + if ($immediatly) { |
|
| 421 | + $this->jquery_code_for_compile [] = $str; |
|
| 422 | + } |
|
| 415 | 423 | return $str; |
| 416 | 424 | } |
| 417 | 425 | |
@@ -481,8 +489,9 @@ discard block |
||
| 481 | 489 | $str .= "else{" . $jsCodeIfFalse . "}"; |
| 482 | 490 | } |
| 483 | 491 | |
| 484 | - if ($immediatly) |
|
| 485 | - $this->jquery_code_for_compile [] = $str; |
|
| 492 | + if ($immediatly) { |
|
| 493 | + $this->jquery_code_for_compile [] = $str; |
|
| 494 | + } |
|
| 486 | 495 | return $str; |
| 487 | 496 | } |
| 488 | 497 | |
@@ -500,11 +509,13 @@ discard block |
||
| 500 | 509 | private function _doJQuery($element, $jqueryCall, $param = "", $jsCallback = "", $immediatly = false) { |
| 501 | 510 | $param = Javascript::prep_value ( $param ); |
| 502 | 511 | $callback = ""; |
| 503 | - if ($jsCallback != "") |
|
| 504 | - $callback = ", function(event){\n{$jsCallback}\n}"; |
|
| 512 | + if ($jsCallback != "") { |
|
| 513 | + $callback = ", function(event){\n{$jsCallback}\n}"; |
|
| 514 | + } |
|
| 505 | 515 | $script = "$(" . Javascript::prep_element ( $element ) . ")." . $jqueryCall . "(" . $param . $callback . ");\n"; |
| 506 | - if ($immediatly) |
|
| 507 | - $this->jquery_code_for_compile [] = $script; |
|
| 516 | + if ($immediatly) { |
|
| 517 | + $this->jquery_code_for_compile [] = $script; |
|
| 518 | + } |
|
| 508 | 519 | return $script; |
| 509 | 520 | } |
| 510 | 521 | |
@@ -591,8 +602,9 @@ discard block |
||
| 591 | 602 | */ |
| 592 | 603 | public function exec($js, $immediatly = false) { |
| 593 | 604 | $script = $js . "\n"; |
| 594 | - if ($immediatly) |
|
| 595 | - $this->jquery_code_for_compile [] = $script; |
|
| 605 | + if ($immediatly) { |
|
| 606 | + $this->jquery_code_for_compile [] = $script; |
|
| 607 | + } |
|
| 596 | 608 | return $script; |
| 597 | 609 | } |
| 598 | 610 | |
