jcheron /
phalcon-jquery
@@ -159,7 +159,7 @@ discard block |
||
| 159 | 159 | * Outputs a jQuery click event |
| 160 | 160 | * |
| 161 | 161 | * @param string $element The element to attach the event to |
| 162 | - * @param mixed $js The code to execute |
|
| 162 | + * @param string $js The code to execute |
|
| 163 | 163 | * @param boolean $ret_false whether or not to return false |
| 164 | 164 | * @return string |
| 165 | 165 | */ |
@@ -235,6 +235,8 @@ discard block |
||
| 235 | 235 | * @param string - element |
| 236 | 236 | * @param string - Javascript code for mouse over |
| 237 | 237 | * @param string - Javascript code for mouse out |
| 238 | + * @param string $over |
|
| 239 | + * @param string $out |
|
| 238 | 240 | * @return string |
| 239 | 241 | */ |
| 240 | 242 | public function _hover($element='this', $over, $out) { |
@@ -768,7 +770,7 @@ discard block |
||
| 768 | 770 | * |
| 769 | 771 | * @param string $element |
| 770 | 772 | * @param array $options |
| 771 | - * @return void |
|
| 773 | + * @return string |
|
| 772 | 774 | */ |
| 773 | 775 | public function sortable($element, $options=array()) { |
| 774 | 776 | if (count($options)>0) { |
@@ -904,6 +906,7 @@ discard block |
||
| 904 | 906 | /** |
| 905 | 907 | * A wrapper for writing document.ready() |
| 906 | 908 | * |
| 909 | + * @param string $js |
|
| 907 | 910 | * @return string |
| 908 | 911 | */ |
| 909 | 912 | public function _document_ready($js) { |
@@ -958,7 +961,7 @@ discard block |
||
| 958 | 961 | /** |
| 959 | 962 | * Ensures the speed parameter is valid for jQuery |
| 960 | 963 | * |
| 961 | - * @param string|int $speed |
|
| 964 | + * @param string $speed |
|
| 962 | 965 | * @return string |
| 963 | 966 | */ |
| 964 | 967 | private function _validate_speed($speed) { |
@@ -973,6 +976,10 @@ discard block |
||
| 973 | 976 | return $speed; |
| 974 | 977 | } |
| 975 | 978 | // ------------------------------------------------------------------------ |
| 979 | + |
|
| 980 | + /** |
|
| 981 | + * @param string $retour |
|
| 982 | + */ |
|
| 976 | 983 | protected function addLoading(&$retour, $responseElement) { |
| 977 | 984 | $loading_notifier='<div class="ajax-loader">'; |
| 978 | 985 | if ($this->ajaxLoader=='') { |
@@ -985,13 +992,25 @@ discard block |
||
| 985 | 992 | $retour.="\t\t$({$responseElement}).prepend('{$loading_notifier}');\n"; |
| 986 | 993 | } |
| 987 | 994 | |
| 995 | + /** |
|
| 996 | + * @param string $url |
|
| 997 | + * @param string $jsCallback |
|
| 998 | + */ |
|
| 988 | 999 | public function _get($url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true,$immediatly=false) { |
| 989 | 1000 | return $this->_ajax("get", $url,$params,$responseElement,$jsCallback,$attr,$hasLoader,$immediatly); |
| 990 | 1001 | } |
| 1002 | + |
|
| 1003 | + /** |
|
| 1004 | + * @param string $url |
|
| 1005 | + * @param string $jsCallback |
|
| 1006 | + */ |
|
| 991 | 1007 | public function _post($url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true,$immediatly=false) { |
| 992 | 1008 | return $this->_ajax("post", $url,$params,$responseElement,$jsCallback,$attr,$hasLoader,$immediatly); |
| 993 | 1009 | } |
| 994 | 1010 | |
| 1011 | + /** |
|
| 1012 | + * @param string $method |
|
| 1013 | + */ |
|
| 995 | 1014 | protected function _ajax($method,$url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true,$immediatly=false) { |
| 996 | 1015 | if(JString::isNull($params)){$params="{}";} |
| 997 | 1016 | $jsCallback=isset($jsCallback) ? $jsCallback : ""; |
@@ -1008,6 +1027,9 @@ discard block |
||
| 1008 | 1027 | return $retour; |
| 1009 | 1028 | } |
| 1010 | 1029 | |
| 1030 | + /** |
|
| 1031 | + * @param string $attr |
|
| 1032 | + */ |
|
| 1011 | 1033 | protected function _getAjaxUrl($url,$attr){ |
| 1012 | 1034 | $url=$this->_correctAjaxUrl($url); |
| 1013 | 1035 | $retour="url='".$url."';\n"; |
@@ -1139,6 +1161,12 @@ discard block |
||
| 1139 | 1161 | return $this->_add_event($element, $this->_jsonArray($maskSelector,$url,$method, $params,$jsCallback, $attr, $context), $event, $preventDefault, $stopPropagation,$immediatly); |
| 1140 | 1162 | } |
| 1141 | 1163 | |
| 1164 | + /** |
|
| 1165 | + * @param string $url |
|
| 1166 | + * @param string $form |
|
| 1167 | + * @param string $responseElement |
|
| 1168 | + * @param string $jsCallback |
|
| 1169 | + */ |
|
| 1142 | 1170 | public function _postForm($url, $form, $responseElement, $validation=false, $jsCallback=NULL, $attr="id", $hasLoader=true,$immediatly=false) { |
| 1143 | 1171 | $jsCallback=isset($jsCallback) ? $jsCallback : ""; |
| 1144 | 1172 | $retour=$this->_getAjaxUrl($url, $attr); |
@@ -1252,7 +1280,7 @@ discard block |
||
| 1252 | 1280 | * @param string $element |
| 1253 | 1281 | * @param string $elementToModify |
| 1254 | 1282 | * @param string $jqueryCall |
| 1255 | - * @param string|array $param |
|
| 1283 | + * @param string $param |
|
| 1256 | 1284 | * @param boolean $preventDefault |
| 1257 | 1285 | * @param boolean $stopPropagation |
| 1258 | 1286 | * @param string $jsCallback javascript code to execute after the jquery call |
@@ -1290,6 +1318,9 @@ discard block |
||
| 1290 | 1318 | return $this->_add_event($element, $this->_exec($js), $event, $preventDefault, $stopPropagation,$immediatly); |
| 1291 | 1319 | } |
| 1292 | 1320 | |
| 1321 | + /** |
|
| 1322 | + * @param string $input |
|
| 1323 | + */ |
|
| 1293 | 1324 | private function minify($input) { |
| 1294 | 1325 | if(trim($input) === "") return $input; |
| 1295 | 1326 | return preg_replace( |
@@ -21,14 +21,14 @@ discard block |
||
| 21 | 21 | protected $_bootstrap; |
| 22 | 22 | protected $libraryFile; |
| 23 | 23 | protected $_javascript_folder='js'; |
| 24 | - protected $jquery_code_for_load=array (); |
|
| 25 | - protected $jquery_code_for_compile=array (); |
|
| 24 | + protected $jquery_code_for_load=array(); |
|
| 25 | + protected $jquery_code_for_compile=array(); |
|
| 26 | 26 | protected $jquery_corner_active=FALSE; |
| 27 | 27 | protected $jquery_table_sorter_active=FALSE; |
| 28 | 28 | protected $jquery_table_sorter_pager_active=FALSE; |
| 29 | 29 | protected $ajaxLoader='<span></span><span></span><span></span><span></span><span></span>'; |
| 30 | - protected $jquery_events=array ( |
|
| 31 | - "bind","blur","change","click","dblclick","delegate","die","error","focus","focusin","focusout","hover","keydown","keypress","keyup","live","load","mousedown","mousseenter","mouseleave","mousemove","mouseout","mouseover","mouseup","off","on","one","ready","resize","scroll","select","submit","toggle","trigger","triggerHandler","undind","undelegate","unload" |
|
| 30 | + protected $jquery_events=array( |
|
| 31 | + "bind", "blur", "change", "click", "dblclick", "delegate", "die", "error", "focus", "focusin", "focusout", "hover", "keydown", "keypress", "keyup", "live", "load", "mousedown", "mousseenter", "mouseleave", "mousemove", "mouseout", "mouseover", "mouseup", "off", "on", "one", "ready", "resize", "scroll", "select", "submit", "toggle", "trigger", "triggerHandler", "undind", "undelegate", "unload" |
|
| 32 | 32 | ); |
| 33 | 33 | |
| 34 | 34 | public function setDi($di) { |
@@ -51,7 +51,7 @@ discard block |
||
| 51 | 51 | |
| 52 | 52 | public function __construct($params) { |
| 53 | 53 | $this->params=array(); |
| 54 | - foreach ( $params as $key => $val ) { |
|
| 54 | + foreach ($params as $key => $val) { |
|
| 55 | 55 | $this->params[$key]=$params[$key]; |
| 56 | 56 | } |
| 57 | 57 | } |
@@ -165,7 +165,7 @@ discard block |
||
| 165 | 165 | */ |
| 166 | 166 | public function _click($element='this', $js=array(), $ret_false=TRUE) { |
| 167 | 167 | if (!is_array($js)) { |
| 168 | - $js=array ( |
|
| 168 | + $js=array( |
|
| 169 | 169 | $js |
| 170 | 170 | ); |
| 171 | 171 | } |
@@ -360,12 +360,12 @@ discard block |
||
| 360 | 360 | */ |
| 361 | 361 | public function _output($array_js='') { |
| 362 | 362 | if (!is_array($array_js)) { |
| 363 | - $array_js=array ( |
|
| 363 | + $array_js=array( |
|
| 364 | 364 | $array_js |
| 365 | 365 | ); |
| 366 | 366 | } |
| 367 | 367 | |
| 368 | - foreach ( $array_js as $js ) { |
|
| 368 | + foreach ($array_js as $js) { |
|
| 369 | 369 | $this->jquery_code_for_compile[]="\t$js\n"; |
| 370 | 370 | } |
| 371 | 371 | } |
@@ -420,7 +420,7 @@ discard block |
||
| 420 | 420 | * @param boolean $immediatly defers the execution if set to false |
| 421 | 421 | * @return string |
| 422 | 422 | */ |
| 423 | - public function after($element='this', $value='', $immediatly=false){ |
|
| 423 | + public function after($element='this', $value='', $immediatly=false) { |
|
| 424 | 424 | $element=$this->_prep_element($element); |
| 425 | 425 | $value=$this->_prep_value($value); |
| 426 | 426 | $str="$({$element}).after({$value});"; |
@@ -441,7 +441,7 @@ discard block |
||
| 441 | 441 | if (isset($value)) { |
| 442 | 442 | $value=$this->_prep_value($value); |
| 443 | 443 | $str="$({$element}).attr(\"$attributeName\",{$value});"; |
| 444 | - } else |
|
| 444 | + }else |
|
| 445 | 445 | $str="$({$element}).attr(\"$attributeName\");"; |
| 446 | 446 | if ($immediatly) |
| 447 | 447 | $this->jquery_code_for_compile[]=$str; |
@@ -455,12 +455,12 @@ discard block |
||
| 455 | 455 | * @param string $param |
| 456 | 456 | * @param boolean $immediatly delayed if false |
| 457 | 457 | */ |
| 458 | - public function _genericCallValue($jQueryCall,$element='this', $param="", $immediatly=false) { |
|
| 458 | + public function _genericCallValue($jQueryCall, $element='this', $param="", $immediatly=false) { |
|
| 459 | 459 | $element=$this->_prep_element($element); |
| 460 | 460 | if (isset($param)) { |
| 461 | 461 | $param=$this->_prep_value($param); |
| 462 | 462 | $str="$({$element}).{$jQueryCall}({$param});"; |
| 463 | - } else |
|
| 463 | + }else |
|
| 464 | 464 | $str="$({$element}).{$jQueryCall}();"; |
| 465 | 465 | if ($immediatly) |
| 466 | 466 | $this->jquery_code_for_compile[]=$str; |
@@ -474,7 +474,7 @@ discard block |
||
| 474 | 474 | * @param boolean $immediatly delayed if false |
| 475 | 475 | * @return string |
| 476 | 476 | */ |
| 477 | - public function _genericCallElement($jQueryCall,$to='this', $element, $immediatly=false) { |
|
| 477 | + public function _genericCallElement($jQueryCall, $to='this', $element, $immediatly=false) { |
|
| 478 | 478 | $to=$this->_prep_element($to); |
| 479 | 479 | $element=$this->_prep_element($element); |
| 480 | 480 | $str="$({$to}).{$jQueryCall}({$element});"; |
@@ -500,7 +500,7 @@ discard block |
||
| 500 | 500 | |
| 501 | 501 | $animations="\t\t\t"; |
| 502 | 502 | if (is_array($params)) { |
| 503 | - foreach ( $params as $param => $value ) { |
|
| 503 | + foreach ($params as $param => $value) { |
|
| 504 | 504 | $animations.=$param.': \''.$value.'\', '; |
| 505 | 505 | } |
| 506 | 506 | } |
@@ -772,12 +772,12 @@ discard block |
||
| 772 | 772 | */ |
| 773 | 773 | public function sortable($element, $options=array()) { |
| 774 | 774 | if (count($options)>0) { |
| 775 | - $sort_options=array (); |
|
| 776 | - foreach ( $options as $k => $v ) { |
|
| 775 | + $sort_options=array(); |
|
| 776 | + foreach ($options as $k => $v) { |
|
| 777 | 777 | $sort_options[]="\n\t\t".$k.': '.$v.""; |
| 778 | 778 | } |
| 779 | 779 | $sort_options=implode(",", $sort_options); |
| 780 | - } else { |
|
| 780 | + }else { |
|
| 781 | 781 | $sort_options=''; |
| 782 | 782 | } |
| 783 | 783 | |
@@ -811,7 +811,7 @@ discard block |
||
| 811 | 811 | * @param boolean $stopPropagation Prevents the event from bubbling up the DOM tree, preventing any parent handlers from being notified of the event. |
| 812 | 812 | * @return string |
| 813 | 813 | */ |
| 814 | - public function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false,$immediatly=true) { |
|
| 814 | + public function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false, $immediatly=true) { |
|
| 815 | 815 | if (is_array($js)) { |
| 816 | 816 | $js=implode("\n\t\t", $js); |
| 817 | 817 | } |
@@ -825,7 +825,7 @@ discard block |
||
| 825 | 825 | $event="\n\t$(".$this->_prep_element($element).").bind('{$event}',function(event){\n\t\t{$js}\n\t});\n"; |
| 826 | 826 | else |
| 827 | 827 | $event="\n\t$(".$this->_prep_element($element).").{$event}(function(event){\n\t\t{$js}\n\t});\n"; |
| 828 | - if($immediatly) |
|
| 828 | + if ($immediatly) |
|
| 829 | 829 | $this->jquery_code_for_compile[]=$event; |
| 830 | 830 | return $event; |
| 831 | 831 | } |
@@ -859,7 +859,7 @@ discard block |
||
| 859 | 859 | |
| 860 | 860 | // External references |
| 861 | 861 | $external_scripts=implode('', $this->jquery_code_for_load); |
| 862 | - extract(array ( |
|
| 862 | + extract(array( |
|
| 863 | 863 | 'library_src' => $external_scripts |
| 864 | 864 | )); |
| 865 | 865 | |
@@ -874,7 +874,7 @@ discard block |
||
| 874 | 874 | $script.='});'; |
| 875 | 875 | |
| 876 | 876 | $this->jquery_code_for_compile=array(); |
| 877 | - if($this->params["debug"]==false){ |
|
| 877 | + if ($this->params["debug"]==false) { |
|
| 878 | 878 | $script=$this->minify($script); |
| 879 | 879 | } |
| 880 | 880 | $output=($script_tags===FALSE) ? $script : $this->inline($script); |
@@ -896,7 +896,7 @@ discard block |
||
| 896 | 896 | * @return void |
| 897 | 897 | */ |
| 898 | 898 | public function _clear_compile() { |
| 899 | - $this->jquery_code_for_compile=array (); |
|
| 899 | + $this->jquery_code_for_compile=array(); |
|
| 900 | 900 | } |
| 901 | 901 | |
| 902 | 902 | // -------------------------------------------------------------------- |
@@ -908,12 +908,12 @@ discard block |
||
| 908 | 908 | */ |
| 909 | 909 | public function _document_ready($js) { |
| 910 | 910 | if (!is_array($js)) { |
| 911 | - $js=array ( |
|
| 911 | + $js=array( |
|
| 912 | 912 | $js |
| 913 | 913 | ); |
| 914 | 914 | } |
| 915 | 915 | |
| 916 | - foreach ( $js as $script ) { |
|
| 916 | + foreach ($js as $script) { |
|
| 917 | 917 | $this->jquery_code_for_compile[]=$script; |
| 918 | 918 | } |
| 919 | 919 | } |
@@ -929,7 +929,7 @@ discard block |
||
| 929 | 929 | * @return string |
| 930 | 930 | */ |
| 931 | 931 | public function _prep_element($element) { |
| 932 | - if (strrpos($element, 'this')===false&&strrpos($element, 'event')===false&&strrpos($element, 'self')===false) { |
|
| 932 | + if (strrpos($element, 'this')===false && strrpos($element, 'event')===false && strrpos($element, 'self')===false) { |
|
| 933 | 933 | $element='"'.addslashes($element).'"'; |
| 934 | 934 | } |
| 935 | 935 | return $element; |
@@ -947,7 +947,7 @@ discard block |
||
| 947 | 947 | if (is_array($value)) { |
| 948 | 948 | $value=implode(",", $value); |
| 949 | 949 | } |
| 950 | - if (strrpos($value, 'this')===false&&strrpos($value, 'event')===false&&strrpos($value, 'self')===false) { |
|
| 950 | + if (strrpos($value, 'this')===false && strrpos($value, 'event')===false && strrpos($value, 'self')===false) { |
|
| 951 | 951 | $value='"'.$value.'"'; |
| 952 | 952 | } |
| 953 | 953 | return $value; |
@@ -962,8 +962,8 @@ discard block |
||
| 962 | 962 | * @return string |
| 963 | 963 | */ |
| 964 | 964 | private function _validate_speed($speed) { |
| 965 | - if (in_array($speed, array ( |
|
| 966 | - 'slow','normal','fast' |
|
| 965 | + if (in_array($speed, array( |
|
| 966 | + 'slow', 'normal', 'fast' |
|
| 967 | 967 | ))) { |
| 968 | 968 | $speed='"'.$speed.'"'; |
| 969 | 969 | } elseif (preg_match("/[^0-9]/", $speed)) { |
@@ -977,7 +977,7 @@ discard block |
||
| 977 | 977 | $loading_notifier='<div class="ajax-loader">'; |
| 978 | 978 | if ($this->ajaxLoader=='') { |
| 979 | 979 | $loading_notifier.="Loading..."; |
| 980 | - } else { |
|
| 980 | + }else { |
|
| 981 | 981 | $loading_notifier.=$this->ajaxLoader; |
| 982 | 982 | } |
| 983 | 983 | $loading_notifier.='</div>'; |
@@ -985,20 +985,20 @@ discard block |
||
| 985 | 985 | $retour.="\t\t$({$responseElement}).prepend('{$loading_notifier}');\n"; |
| 986 | 986 | } |
| 987 | 987 | |
| 988 | - public function _get($url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true,$immediatly=false) { |
|
| 989 | - return $this->_ajax("get", $url,$params,$responseElement,$jsCallback,$attr,$hasLoader,$immediatly); |
|
| 988 | + public function _get($url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true, $immediatly=false) { |
|
| 989 | + return $this->_ajax("get", $url, $params, $responseElement, $jsCallback, $attr, $hasLoader, $immediatly); |
|
| 990 | 990 | } |
| 991 | - public function _post($url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true,$immediatly=false) { |
|
| 992 | - return $this->_ajax("post", $url,$params,$responseElement,$jsCallback,$attr,$hasLoader,$immediatly); |
|
| 991 | + public function _post($url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true, $immediatly=false) { |
|
| 992 | + return $this->_ajax("post", $url, $params, $responseElement, $jsCallback, $attr, $hasLoader, $immediatly); |
|
| 993 | 993 | } |
| 994 | 994 | |
| 995 | - protected function _ajax($method,$url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true,$immediatly=false) { |
|
| 996 | - if(JString::isNull($params)){$params="{}";} |
|
| 995 | + protected function _ajax($method, $url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true, $immediatly=false) { |
|
| 996 | + if (JString::isNull($params)) {$params="{}"; } |
|
| 997 | 997 | $jsCallback=isset($jsCallback) ? $jsCallback : ""; |
| 998 | 998 | $retour=$this->_getAjaxUrl($url, $attr); |
| 999 | 999 | $responseElement=$this->_getResponseElement($responseElement); |
| 1000 | 1000 | $retour.="var self=this;\n"; |
| 1001 | - if($hasLoader===true){ |
|
| 1001 | + if ($hasLoader===true) { |
|
| 1002 | 1002 | $this->addLoading($retour, $responseElement); |
| 1003 | 1003 | } |
| 1004 | 1004 | $retour.="$.".$method."(url,".$params.").done(function( data ) {\n"; |
@@ -1008,22 +1008,22 @@ discard block |
||
| 1008 | 1008 | return $retour; |
| 1009 | 1009 | } |
| 1010 | 1010 | |
| 1011 | - protected function _getAjaxUrl($url,$attr){ |
|
| 1011 | + protected function _getAjaxUrl($url, $attr) { |
|
| 1012 | 1012 | $url=$this->_correctAjaxUrl($url); |
| 1013 | 1013 | $retour="url='".$url."';\n"; |
| 1014 | 1014 | $slash="/"; |
| 1015 | - if(PhalconUtils::endsWith($url, "/")) |
|
| 1015 | + if (PhalconUtils::endsWith($url, "/")) |
|
| 1016 | 1016 | $slash=""; |
| 1017 | - if(JString::isNotNull($attr)){ |
|
| 1017 | + if (JString::isNotNull($attr)) { |
|
| 1018 | 1018 | if ($attr=="value") |
| 1019 | 1019 | $retour.="url=url+'".$slash."'+$(this).val();\n"; |
| 1020 | - else if($attr!=null && $attr!=="") |
|
| 1020 | + else if ($attr!=null && $attr!=="") |
|
| 1021 | 1021 | $retour.="url=url+'".$slash."'+$(this).attr('".$attr."');\n"; |
| 1022 | 1022 | } |
| 1023 | 1023 | return $retour; |
| 1024 | 1024 | } |
| 1025 | 1025 | |
| 1026 | - protected function _getOnAjaxDone($responseElement,$jsCallback){ |
|
| 1026 | + protected function _getOnAjaxDone($responseElement, $jsCallback) { |
|
| 1027 | 1027 | $retour=""; |
| 1028 | 1028 | if ($responseElement!=="") { |
| 1029 | 1029 | $retour="\t$({$responseElement}).html( data );\n"; |
@@ -1032,7 +1032,7 @@ discard block |
||
| 1032 | 1032 | return $retour; |
| 1033 | 1033 | } |
| 1034 | 1034 | |
| 1035 | - protected function _getResponseElement($responseElement){ |
|
| 1035 | + protected function _getResponseElement($responseElement) { |
|
| 1036 | 1036 | if ($responseElement!=="") { |
| 1037 | 1037 | $responseElement=$this->_prep_value($responseElement); |
| 1038 | 1038 | } |
@@ -1042,7 +1042,7 @@ discard block |
||
| 1042 | 1042 | protected function _correctAjaxUrl($url) { |
| 1043 | 1043 | if (PhalconUtils::endsWith($url, "/")) |
| 1044 | 1044 | $url=substr($url, 0, strlen($url)-1); |
| 1045 | - if (strncmp($url, 'http://', 7)!=0&&strncmp($url, 'https://', 8)!=0) { |
|
| 1045 | + if (strncmp($url, 'http://', 7)!=0 && strncmp($url, 'https://', 8)!=0) { |
|
| 1046 | 1046 | $url=$this->_di->get("url")->get($url); |
| 1047 | 1047 | } |
| 1048 | 1048 | return $url; |
@@ -1056,7 +1056,7 @@ discard block |
||
| 1056 | 1056 | * @param string $jsCallback javascript code to execute after the request |
| 1057 | 1057 | * @param boolean $immediatly |
| 1058 | 1058 | */ |
| 1059 | - public function _json($url, $method="get", $params="{}", $jsCallback=NULL, $attr="id", $context="document",$immediatly=false) { |
|
| 1059 | + public function _json($url, $method="get", $params="{}", $jsCallback=NULL, $attr="id", $context="document", $immediatly=false) { |
|
| 1060 | 1060 | $jsCallback=isset($jsCallback) ? $jsCallback : ""; |
| 1061 | 1061 | $retour=$this->_getAjaxUrl($url, $attr); |
| 1062 | 1062 | $retour.="$.{$method}(url,".$params.").done(function( data ) {\n"; |
@@ -1077,7 +1077,7 @@ discard block |
||
| 1077 | 1077 | * @param string $url the request address |
| 1078 | 1078 | * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","params"=>"{}","method"=>"get","immediatly"=>true) |
| 1079 | 1079 | */ |
| 1080 | - public function _jsonOn($event,$element, $url,$parameters=array()) { |
|
| 1080 | + public function _jsonOn($event, $element, $url, $parameters=array()) { |
|
| 1081 | 1081 | $preventDefault=true; |
| 1082 | 1082 | $stopPropagation=true; |
| 1083 | 1083 | $jsCallback=null; |
@@ -1087,7 +1087,7 @@ discard block |
||
| 1087 | 1087 | $params="{}"; |
| 1088 | 1088 | $immediatly=true; |
| 1089 | 1089 | extract($parameters); |
| 1090 | - return $this->_add_event($element, $this->_json($url,$method, $params,$jsCallback, $attr,$context), $event, $preventDefault, $stopPropagation,$immediatly); |
|
| 1090 | + return $this->_add_event($element, $this->_json($url, $method, $params, $jsCallback, $attr, $context), $event, $preventDefault, $stopPropagation, $immediatly); |
|
| 1091 | 1091 | } |
| 1092 | 1092 | |
| 1093 | 1093 | /** |
@@ -1099,19 +1099,19 @@ discard block |
||
| 1099 | 1099 | * @param string $context jquery DOM element, array container. |
| 1100 | 1100 | * @param boolean $immediatly |
| 1101 | 1101 | */ |
| 1102 | - public function _jsonArray($maskSelector, $url, $method="get", $params="{}", $jsCallback=NULL, $attr="id", $context=null,$immediatly=false) { |
|
| 1102 | + public function _jsonArray($maskSelector, $url, $method="get", $params="{}", $jsCallback=NULL, $attr="id", $context=null, $immediatly=false) { |
|
| 1103 | 1103 | $jsCallback=isset($jsCallback) ? $jsCallback : ""; |
| 1104 | 1104 | $retour=$this->_getAjaxUrl($url, $attr); |
| 1105 | - if($context===null){ |
|
| 1105 | + if ($context===null) { |
|
| 1106 | 1106 | $appendTo="\t\tnewElm.appendTo($('".$maskSelector."').parent());\n"; |
| 1107 | - $newElm = "$('#'+newId)"; |
|
| 1108 | - }else{ |
|
| 1107 | + $newElm="$('#'+newId)"; |
|
| 1108 | + }else { |
|
| 1109 | 1109 | $appendTo="\t\tnewElm.appendTo(".$context.");\n"; |
| 1110 | - $newElm = $context.".find('#'+newId)"; |
|
| 1110 | + $newElm=$context.".find('#'+newId)"; |
|
| 1111 | 1111 | } |
| 1112 | 1112 | $retour.="var self = $(this);\n$.{$method}(url,".$params.").done(function( data ) {\n"; |
| 1113 | 1113 | $retour.="\tdata=$.parseJSON(data);$.each(data, function(index, value) {\n"."\tvar created=false;var maskElm=$('".$maskSelector."').first();maskElm.hide();"."\tvar newId=(maskElm.attr('id') || 'mask')+'-'+index;"."\tvar newElm=".$newElm.";\n"."\tif(!newElm.length){\n"."\t\tnewElm=maskElm.clone();newElm.attr('id',newId);\n"; |
| 1114 | - $retour.= $appendTo; |
|
| 1114 | + $retour.=$appendTo; |
|
| 1115 | 1115 | $retour.="\t}\n"."\tfor(var key in value){\n"."\t\t\tvar html = $('<div />').append($(newElm).clone()).html();\n"."\t\t\tif(html.indexOf('[['+key+']]')>-1){\n"."\t\t\t\tcontent=$(html.split('[['+key+']]').join(value[key]));\n"."\t\t\t\t$(newElm).replaceWith(content);newElm=content;\n"."\t\t\t}\n"."\t\tvar sel='[data-id=\"'+key+'\"]';if($(sel,newElm).length){\n"."\t\t\tvar selElm=$(sel,newElm);\n"."\t\t\t if(selElm.is('[value]')) { selElm.attr('value',value[key]);selElm.val(value[key]);} else { selElm.html(value[key]); }\n"."\t\t}\n"."}\n"."\t$(newElm).show(true);"."\n"."\t$(newElm).removeClass('hide');"."});\n"; |
| 1116 | 1116 | $retour.="\t$(document).trigger('jsonReady',[data]);\n"; |
| 1117 | 1117 | $retour.="\t".$jsCallback."\n"."});\n"; |
@@ -1126,26 +1126,26 @@ discard block |
||
| 1126 | 1126 | * @param string $url the request address |
| 1127 | 1127 | * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","params"=>"{}","method"=>"get", "context"=>null) |
| 1128 | 1128 | */ |
| 1129 | - public function _jsonArrayOn($event,$element, $maskSelector,$url,$parameters=array()) { |
|
| 1129 | + public function _jsonArrayOn($event, $element, $maskSelector, $url, $parameters=array()) { |
|
| 1130 | 1130 | $preventDefault=true; |
| 1131 | 1131 | $stopPropagation=true; |
| 1132 | 1132 | $jsCallback=null; |
| 1133 | 1133 | $attr="id"; |
| 1134 | 1134 | $method="get"; |
| 1135 | - $context = null; |
|
| 1135 | + $context=null; |
|
| 1136 | 1136 | $params="{}"; |
| 1137 | 1137 | $immediatly=true; |
| 1138 | 1138 | extract($parameters); |
| 1139 | - return $this->_add_event($element, $this->_jsonArray($maskSelector,$url,$method, $params,$jsCallback, $attr, $context), $event, $preventDefault, $stopPropagation,$immediatly); |
|
| 1139 | + return $this->_add_event($element, $this->_jsonArray($maskSelector, $url, $method, $params, $jsCallback, $attr, $context), $event, $preventDefault, $stopPropagation, $immediatly); |
|
| 1140 | 1140 | } |
| 1141 | 1141 | |
| 1142 | - public function _postForm($url, $form, $responseElement, $validation=false, $jsCallback=NULL, $attr="id", $hasLoader=true,$immediatly=false) { |
|
| 1142 | + public function _postForm($url, $form, $responseElement, $validation=false, $jsCallback=NULL, $attr="id", $hasLoader=true, $immediatly=false) { |
|
| 1143 | 1143 | $jsCallback=isset($jsCallback) ? $jsCallback : ""; |
| 1144 | 1144 | $retour=$this->_getAjaxUrl($url, $attr); |
| 1145 | 1145 | $retour.="\nvar params=$('#".$form."').serialize();\n"; |
| 1146 | 1146 | $responseElement=$this->_getResponseElement($responseElement); |
| 1147 | 1147 | $retour.="var self=this;\n"; |
| 1148 | - if($hasLoader===true){ |
|
| 1148 | + if ($hasLoader===true) { |
|
| 1149 | 1149 | $this->addLoading($retour, $responseElement); |
| 1150 | 1150 | } |
| 1151 | 1151 | $retour.="$.post(url,params).done(function( data ) {\n"; |
@@ -1172,7 +1172,7 @@ discard block |
||
| 1172 | 1172 | * @param string $responseElement |
| 1173 | 1173 | * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true) |
| 1174 | 1174 | */ |
| 1175 | - public function _getOn($event,$element, $url, $params="{}", $responseElement="", $parameters=array()) { |
|
| 1175 | + public function _getOn($event, $element, $url, $params="{}", $responseElement="", $parameters=array()) { |
|
| 1176 | 1176 | $preventDefault=true; |
| 1177 | 1177 | $stopPropagation=true; |
| 1178 | 1178 | $jsCallback=null; |
@@ -1180,7 +1180,7 @@ discard block |
||
| 1180 | 1180 | $hasLoader=true; |
| 1181 | 1181 | $immediatly=true; |
| 1182 | 1182 | extract($parameters); |
| 1183 | - return $this->_add_event($element, $this->_get($url, $params, $responseElement, $jsCallback, $attr,$hasLoader), $event, $preventDefault, $stopPropagation,$immediatly); |
|
| 1183 | + return $this->_add_event($element, $this->_get($url, $params, $responseElement, $jsCallback, $attr, $hasLoader), $event, $preventDefault, $stopPropagation, $immediatly); |
|
| 1184 | 1184 | } |
| 1185 | 1185 | |
| 1186 | 1186 | /** |
@@ -1193,7 +1193,7 @@ discard block |
||
| 1193 | 1193 | * @param string $responseElement |
| 1194 | 1194 | * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true) |
| 1195 | 1195 | */ |
| 1196 | - public function _postOn($event,$element, $url, $params="{}", $responseElement="", $parameters=array()) { |
|
| 1196 | + public function _postOn($event, $element, $url, $params="{}", $responseElement="", $parameters=array()) { |
|
| 1197 | 1197 | $preventDefault=true; |
| 1198 | 1198 | $stopPropagation=true; |
| 1199 | 1199 | $jsCallback=null; |
@@ -1201,7 +1201,7 @@ discard block |
||
| 1201 | 1201 | $hasLoader=true; |
| 1202 | 1202 | $immediatly=true; |
| 1203 | 1203 | extract($parameters); |
| 1204 | - return $this->_add_event($element, $this->_post($url, $params, $responseElement, $jsCallback, $attr,$hasLoader), $event, $preventDefault, $stopPropagation,$immediatly); |
|
| 1204 | + return $this->_add_event($element, $this->_post($url, $params, $responseElement, $jsCallback, $attr, $hasLoader), $event, $preventDefault, $stopPropagation, $immediatly); |
|
| 1205 | 1205 | } |
| 1206 | 1206 | |
| 1207 | 1207 | /** |
@@ -1214,7 +1214,7 @@ discard block |
||
| 1214 | 1214 | * @param string $responseElement |
| 1215 | 1215 | * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"validation"=>false,"jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"immediatly"=>true) |
| 1216 | 1216 | */ |
| 1217 | - public function _postFormOn($event,$element, $url, $form, $responseElement="", $parameters=array()) { |
|
| 1217 | + public function _postFormOn($event, $element, $url, $form, $responseElement="", $parameters=array()) { |
|
| 1218 | 1218 | $preventDefault=true; |
| 1219 | 1219 | $stopPropagation=true; |
| 1220 | 1220 | $validation=false; |
@@ -1223,7 +1223,7 @@ discard block |
||
| 1223 | 1223 | $hasLoader=true; |
| 1224 | 1224 | $immediatly=true; |
| 1225 | 1225 | extract($parameters); |
| 1226 | - return $this->_add_event($element, $this->_postForm($url, $form, $responseElement, $validation, $jsCallback, $attr,$hasLoader), $event, $preventDefault, $stopPropagation,$immediatly); |
|
| 1226 | + return $this->_add_event($element, $this->_postForm($url, $form, $responseElement, $validation, $jsCallback, $attr, $hasLoader), $event, $preventDefault, $stopPropagation, $immediatly); |
|
| 1227 | 1227 | } |
| 1228 | 1228 | |
| 1229 | 1229 | /** |
@@ -1259,8 +1259,8 @@ discard block |
||
| 1259 | 1259 | * @param boolean $immediatly |
| 1260 | 1260 | * @return string |
| 1261 | 1261 | */ |
| 1262 | - public function _doJQueryOn($event, $element, $elementToModify, $jqueryCall, $param="", $preventDefault=false, $stopPropagation=false, $jsCallback="",$immediatly=true) { |
|
| 1263 | - return $this->_add_event($element, $this->_doJQuery($elementToModify, $jqueryCall, $param, $jsCallback), $event, $preventDefault, $stopPropagation,$immediatly); |
|
| 1262 | + public function _doJQueryOn($event, $element, $elementToModify, $jqueryCall, $param="", $preventDefault=false, $stopPropagation=false, $jsCallback="", $immediatly=true) { |
|
| 1263 | + return $this->_add_event($element, $this->_doJQuery($elementToModify, $jqueryCall, $param, $jsCallback), $event, $preventDefault, $stopPropagation, $immediatly); |
|
| 1264 | 1264 | } |
| 1265 | 1265 | |
| 1266 | 1266 | /** |
@@ -1286,12 +1286,12 @@ discard block |
||
| 1286 | 1286 | * @param boolean $immediatly |
| 1287 | 1287 | * @return String |
| 1288 | 1288 | */ |
| 1289 | - public function _execOn($element, $event, $js, $preventDefault=false, $stopPropagation=false,$immediatly=true) { |
|
| 1290 | - return $this->_add_event($element, $this->_exec($js), $event, $preventDefault, $stopPropagation,$immediatly); |
|
| 1289 | + public function _execOn($element, $event, $js, $preventDefault=false, $stopPropagation=false, $immediatly=true) { |
|
| 1290 | + return $this->_add_event($element, $this->_exec($js), $event, $preventDefault, $stopPropagation, $immediatly); |
|
| 1291 | 1291 | } |
| 1292 | 1292 | |
| 1293 | 1293 | private function minify($input) { |
| 1294 | - if(trim($input) === "") return $input; |
|
| 1294 | + if (trim($input)==="") return $input; |
|
| 1295 | 1295 | return preg_replace( |
| 1296 | 1296 | array( |
| 1297 | 1297 | // Remove comment(s) |
@@ -424,8 +424,9 @@ discard block |
||
| 424 | 424 | $element=$this->_prep_element($element); |
| 425 | 425 | $value=$this->_prep_value($value); |
| 426 | 426 | $str="$({$element}).after({$value});"; |
| 427 | - if ($immediatly) |
|
| 428 | - $this->jquery_code_for_compile[]=$str; |
|
| 427 | + if ($immediatly) { |
|
| 428 | + $this->jquery_code_for_compile[]=$str; |
|
| 429 | + } |
|
| 429 | 430 | return $str; |
| 430 | 431 | } |
| 431 | 432 | |
@@ -441,10 +442,12 @@ discard block |
||
| 441 | 442 | if (isset($value)) { |
| 442 | 443 | $value=$this->_prep_value($value); |
| 443 | 444 | $str="$({$element}).attr(\"$attributeName\",{$value});"; |
| 444 | - } else |
|
| 445 | - $str="$({$element}).attr(\"$attributeName\");"; |
|
| 446 | - if ($immediatly) |
|
| 447 | - $this->jquery_code_for_compile[]=$str; |
|
| 445 | + } else { |
|
| 446 | + $str="$({$element}).attr(\"$attributeName\");"; |
|
| 447 | + } |
|
| 448 | + if ($immediatly) { |
|
| 449 | + $this->jquery_code_for_compile[]=$str; |
|
| 450 | + } |
|
| 448 | 451 | return $str; |
| 449 | 452 | } |
| 450 | 453 | |
@@ -460,10 +463,12 @@ discard block |
||
| 460 | 463 | if (isset($param)) { |
| 461 | 464 | $param=$this->_prep_value($param); |
| 462 | 465 | $str="$({$element}).{$jQueryCall}({$param});"; |
| 463 | - } else |
|
| 464 | - $str="$({$element}).{$jQueryCall}();"; |
|
| 465 | - if ($immediatly) |
|
| 466 | - $this->jquery_code_for_compile[]=$str; |
|
| 466 | + } else { |
|
| 467 | + $str="$({$element}).{$jQueryCall}();"; |
|
| 468 | + } |
|
| 469 | + if ($immediatly) { |
|
| 470 | + $this->jquery_code_for_compile[]=$str; |
|
| 471 | + } |
|
| 467 | 472 | return $str; |
| 468 | 473 | } |
| 469 | 474 | /** |
@@ -478,8 +483,9 @@ discard block |
||
| 478 | 483 | $to=$this->_prep_element($to); |
| 479 | 484 | $element=$this->_prep_element($element); |
| 480 | 485 | $str="$({$to}).{$jQueryCall}({$element});"; |
| 481 | - if ($immediatly) |
|
| 482 | - $this->jquery_code_for_compile[]=$str; |
|
| 486 | + if ($immediatly) { |
|
| 487 | + $this->jquery_code_for_compile[]=$str; |
|
| 488 | + } |
|
| 483 | 489 | return $str; |
| 484 | 490 | } |
| 485 | 491 | // -------------------------------------------------------------------- |
@@ -516,8 +522,9 @@ discard block |
||
| 516 | 522 | |
| 517 | 523 | $str="$({$element}).animate({\n$animations\n\t\t}".$speed.$extra.");"; |
| 518 | 524 | |
| 519 | - if ($immediatly) |
|
| 520 | - $this->jquery_code_for_compile[]=$str; |
|
| 525 | + if ($immediatly) { |
|
| 526 | + $this->jquery_code_for_compile[]=$str; |
|
| 527 | + } |
|
| 521 | 528 | return $str; |
| 522 | 529 | } |
| 523 | 530 | |
@@ -542,8 +549,9 @@ discard block |
||
| 542 | 549 | |
| 543 | 550 | $str="$({$element}).fadeIn({$speed}{$callback});"; |
| 544 | 551 | |
| 545 | - if ($immediatly) |
|
| 546 | - $this->jquery_code_for_compile[]=$str; |
|
| 552 | + if ($immediatly) { |
|
| 553 | + $this->jquery_code_for_compile[]=$str; |
|
| 554 | + } |
|
| 547 | 555 | return $str; |
| 548 | 556 | } |
| 549 | 557 | |
@@ -568,8 +576,9 @@ discard block |
||
| 568 | 576 | |
| 569 | 577 | $str="$({$element}).fadeOut({$speed}{$callback});"; |
| 570 | 578 | |
| 571 | - if ($immediatly) |
|
| 572 | - $this->jquery_code_for_compile[]=$str; |
|
| 579 | + if ($immediatly) { |
|
| 580 | + $this->jquery_code_for_compile[]=$str; |
|
| 581 | + } |
|
| 573 | 582 | return $str; |
| 574 | 583 | } |
| 575 | 584 | |
@@ -594,8 +603,9 @@ discard block |
||
| 594 | 603 | |
| 595 | 604 | $str="$({$element}).hide({$speed}{$callback});"; |
| 596 | 605 | |
| 597 | - if ($immediatly) |
|
| 598 | - $this->jquery_code_for_compile[]=$str; |
|
| 606 | + if ($immediatly) { |
|
| 607 | + $this->jquery_code_for_compile[]=$str; |
|
| 608 | + } |
|
| 599 | 609 | return $str; |
| 600 | 610 | } |
| 601 | 611 | |
@@ -622,8 +632,9 @@ discard block |
||
| 622 | 632 | |
| 623 | 633 | $str="$({$element}).slideUp({$speed}{$callback});"; |
| 624 | 634 | |
| 625 | - if ($immediatly) |
|
| 626 | - $this->jquery_code_for_compile[]=$str; |
|
| 635 | + if ($immediatly) { |
|
| 636 | + $this->jquery_code_for_compile[]=$str; |
|
| 637 | + } |
|
| 627 | 638 | return $str; |
| 628 | 639 | } |
| 629 | 640 | |
@@ -648,8 +659,9 @@ discard block |
||
| 648 | 659 | |
| 649 | 660 | $str="$({$element}).slideDown({$speed}{$callback});"; |
| 650 | 661 | |
| 651 | - if ($immediatly) |
|
| 652 | - $this->jquery_code_for_compile[]=$str; |
|
| 662 | + if ($immediatly) { |
|
| 663 | + $this->jquery_code_for_compile[]=$str; |
|
| 664 | + } |
|
| 653 | 665 | return $str; |
| 654 | 666 | } |
| 655 | 667 | |
@@ -674,8 +686,9 @@ discard block |
||
| 674 | 686 | |
| 675 | 687 | $str="$({$element}).slideToggle({$speed}{$callback});"; |
| 676 | 688 | |
| 677 | - if ($immediatly) |
|
| 678 | - $this->jquery_code_for_compile[]=$str; |
|
| 689 | + if ($immediatly) { |
|
| 690 | + $this->jquery_code_for_compile[]=$str; |
|
| 691 | + } |
|
| 679 | 692 | return $str; |
| 680 | 693 | } |
| 681 | 694 | |
@@ -692,8 +705,9 @@ discard block |
||
| 692 | 705 | $element=$this->_prep_element($element); |
| 693 | 706 | $str="$({$element}).toggle();"; |
| 694 | 707 | |
| 695 | - if ($immediatly) |
|
| 696 | - $this->jquery_code_for_compile[]=$str; |
|
| 708 | + if ($immediatly) { |
|
| 709 | + $this->jquery_code_for_compile[]=$str; |
|
| 710 | + } |
|
| 697 | 711 | return $str; |
| 698 | 712 | } |
| 699 | 713 | |
@@ -709,8 +723,9 @@ discard block |
||
| 709 | 723 | $element=$this->_prep_element($element); |
| 710 | 724 | $str="$({$element}).trigger(\"$event\");"; |
| 711 | 725 | |
| 712 | - if ($immediatly) |
|
| 713 | - $this->jquery_code_for_compile[]=$str; |
|
| 726 | + if ($immediatly) { |
|
| 727 | + $this->jquery_code_for_compile[]=$str; |
|
| 728 | + } |
|
| 714 | 729 | return $str; |
| 715 | 730 | } |
| 716 | 731 | |
@@ -735,8 +750,9 @@ discard block |
||
| 735 | 750 | |
| 736 | 751 | $str="$({$element}).show({$speed}{$callback});"; |
| 737 | 752 | |
| 738 | - if ($immediatly) |
|
| 739 | - $this->jquery_code_for_compile[]=$str; |
|
| 753 | + if ($immediatly) { |
|
| 754 | + $this->jquery_code_for_compile[]=$str; |
|
| 755 | + } |
|
| 740 | 756 | return $str; |
| 741 | 757 | } |
| 742 | 758 | |
@@ -754,8 +770,9 @@ discard block |
||
| 754 | 770 | $str.="else{".$jsCodeIfFalse."}"; |
| 755 | 771 | } |
| 756 | 772 | |
| 757 | - if ($immediatly) |
|
| 758 | - $this->jquery_code_for_compile[]=$str; |
|
| 773 | + if ($immediatly) { |
|
| 774 | + $this->jquery_code_for_compile[]=$str; |
|
| 775 | + } |
|
| 759 | 776 | return $str; |
| 760 | 777 | } |
| 761 | 778 | |
@@ -821,12 +838,14 @@ discard block |
||
| 821 | 838 | if ($stopPropagation===true) { |
| 822 | 839 | $js="event.stopPropagation();\n".$js; |
| 823 | 840 | } |
| 824 | - if (array_search($event, $this->jquery_events)===false) |
|
| 825 | - $event="\n\t$(".$this->_prep_element($element).").bind('{$event}',function(event){\n\t\t{$js}\n\t});\n"; |
|
| 826 | - else |
|
| 827 | - $event="\n\t$(".$this->_prep_element($element).").{$event}(function(event){\n\t\t{$js}\n\t});\n"; |
|
| 828 | - if($immediatly) |
|
| 829 | - $this->jquery_code_for_compile[]=$event; |
|
| 841 | + if (array_search($event, $this->jquery_events)===false) { |
|
| 842 | + $event="\n\t$(".$this->_prep_element($element).").bind('{$event}',function(event){\n\t\t{$js}\n\t});\n"; |
|
| 843 | + } else { |
|
| 844 | + $event="\n\t$(".$this->_prep_element($element).").{$event}(function(event){\n\t\t{$js}\n\t});\n"; |
|
| 845 | + } |
|
| 846 | + if($immediatly) { |
|
| 847 | + $this->jquery_code_for_compile[]=$event; |
|
| 848 | + } |
|
| 830 | 849 | return $event; |
| 831 | 850 | } |
| 832 | 851 | |
@@ -879,8 +898,9 @@ discard block |
||
| 879 | 898 | } |
| 880 | 899 | $output=($script_tags===FALSE) ? $script : $this->inline($script); |
| 881 | 900 | |
| 882 | - if ($view!=NULL) |
|
| 883 | - $view->setVar($view_var, $output); |
|
| 901 | + if ($view!=NULL) { |
|
| 902 | + $view->setVar($view_var, $output); |
|
| 903 | + } |
|
| 884 | 904 | return $output; |
| 885 | 905 | } |
| 886 | 906 | |
@@ -1003,8 +1023,9 @@ discard block |
||
| 1003 | 1023 | } |
| 1004 | 1024 | $retour.="$.".$method."(url,".$params.").done(function( data ) {\n"; |
| 1005 | 1025 | $retour.=$this->_getOnAjaxDone($responseElement, $jsCallback)."});\n"; |
| 1006 | - if ($immediatly) |
|
| 1007 | - $this->jquery_code_for_compile[]=$retour; |
|
| 1026 | + if ($immediatly) { |
|
| 1027 | + $this->jquery_code_for_compile[]=$retour; |
|
| 1028 | + } |
|
| 1008 | 1029 | return $retour; |
| 1009 | 1030 | } |
| 1010 | 1031 | |
@@ -1012,13 +1033,15 @@ discard block |
||
| 1012 | 1033 | $url=$this->_correctAjaxUrl($url); |
| 1013 | 1034 | $retour="url='".$url."';\n"; |
| 1014 | 1035 | $slash="/"; |
| 1015 | - if(PhalconUtils::endsWith($url, "/")) |
|
| 1016 | - $slash=""; |
|
| 1036 | + if(PhalconUtils::endsWith($url, "/")) { |
|
| 1037 | + $slash=""; |
|
| 1038 | + } |
|
| 1017 | 1039 | if(JString::isNotNull($attr)){ |
| 1018 | - if ($attr=="value") |
|
| 1019 | - $retour.="url=url+'".$slash."'+$(this).val();\n"; |
|
| 1020 | - else if($attr!=null && $attr!=="") |
|
| 1021 | - $retour.="url=url+'".$slash."'+$(this).attr('".$attr."');\n"; |
|
| 1040 | + if ($attr=="value") { |
|
| 1041 | + $retour.="url=url+'".$slash."'+$(this).val();\n"; |
|
| 1042 | + } else if($attr!=null && $attr!=="") { |
|
| 1043 | + $retour.="url=url+'".$slash."'+$(this).attr('".$attr."');\n"; |
|
| 1044 | + } |
|
| 1022 | 1045 | } |
| 1023 | 1046 | return $retour; |
| 1024 | 1047 | } |
@@ -1040,8 +1063,9 @@ discard block |
||
| 1040 | 1063 | } |
| 1041 | 1064 | |
| 1042 | 1065 | protected function _correctAjaxUrl($url) { |
| 1043 | - if (PhalconUtils::endsWith($url, "/")) |
|
| 1044 | - $url=substr($url, 0, strlen($url)-1); |
|
| 1066 | + if (PhalconUtils::endsWith($url, "/")) { |
|
| 1067 | + $url=substr($url, 0, strlen($url)-1); |
|
| 1068 | + } |
|
| 1045 | 1069 | if (strncmp($url, 'http://', 7)!=0&&strncmp($url, 'https://', 8)!=0) { |
| 1046 | 1070 | $url=$this->_di->get("url")->get($url); |
| 1047 | 1071 | } |
@@ -1065,8 +1089,9 @@ discard block |
||
| 1065 | 1089 | $retour.="\t".$jsCallback."\n". |
| 1066 | 1090 | "\t$(document).trigger('jsonReady',[data]);\n". |
| 1067 | 1091 | "});\n"; |
| 1068 | - if ($immediatly) |
|
| 1069 | - $this->jquery_code_for_compile[]=$retour; |
|
| 1092 | + if ($immediatly) { |
|
| 1093 | + $this->jquery_code_for_compile[]=$retour; |
|
| 1094 | + } |
|
| 1070 | 1095 | return $retour; |
| 1071 | 1096 | } |
| 1072 | 1097 | |
@@ -1105,7 +1130,7 @@ discard block |
||
| 1105 | 1130 | if($context===null){ |
| 1106 | 1131 | $appendTo="\t\tnewElm.appendTo($('".$maskSelector."').parent());\n"; |
| 1107 | 1132 | $newElm = "$('#'+newId)"; |
| 1108 | - }else{ |
|
| 1133 | + } else{ |
|
| 1109 | 1134 | $appendTo="\t\tnewElm.appendTo(".$context.");\n"; |
| 1110 | 1135 | $newElm = $context.".find('#'+newId)"; |
| 1111 | 1136 | } |
@@ -1115,8 +1140,9 @@ discard block |
||
| 1115 | 1140 | $retour.="\t}\n"."\tfor(var key in value){\n"."\t\t\tvar html = $('<div />').append($(newElm).clone()).html();\n"."\t\t\tif(html.indexOf('[['+key+']]')>-1){\n"."\t\t\t\tcontent=$(html.split('[['+key+']]').join(value[key]));\n"."\t\t\t\t$(newElm).replaceWith(content);newElm=content;\n"."\t\t\t}\n"."\t\tvar sel='[data-id=\"'+key+'\"]';if($(sel,newElm).length){\n"."\t\t\tvar selElm=$(sel,newElm);\n"."\t\t\t if(selElm.is('[value]')) { selElm.attr('value',value[key]);selElm.val(value[key]);} else { selElm.html(value[key]); }\n"."\t\t}\n"."}\n"."\t$(newElm).show(true);"."\n"."\t$(newElm).removeClass('hide');"."});\n"; |
| 1116 | 1141 | $retour.="\t$(document).trigger('jsonReady',[data]);\n"; |
| 1117 | 1142 | $retour.="\t".$jsCallback."\n"."});\n"; |
| 1118 | - if ($immediatly) |
|
| 1119 | - $this->jquery_code_for_compile[]=$retour; |
|
| 1143 | + if ($immediatly) { |
|
| 1144 | + $this->jquery_code_for_compile[]=$retour; |
|
| 1145 | + } |
|
| 1120 | 1146 | return $retour; |
| 1121 | 1147 | } |
| 1122 | 1148 | /** |
@@ -1157,8 +1183,9 @@ discard block |
||
| 1157 | 1183 | }});\n"; |
| 1158 | 1184 | $retour.="$('#".$form."').submit();\n"; |
| 1159 | 1185 | } |
| 1160 | - if ($immediatly) |
|
| 1161 | - $this->jquery_code_for_compile[]=$retour; |
|
| 1186 | + if ($immediatly) { |
|
| 1187 | + $this->jquery_code_for_compile[]=$retour; |
|
| 1188 | + } |
|
| 1162 | 1189 | return $retour; |
| 1163 | 1190 | } |
| 1164 | 1191 | |
@@ -1238,11 +1265,13 @@ discard block |
||
| 1238 | 1265 | public function _doJQuery($element, $jqueryCall, $param="", $jsCallback="", $immediatly=false) { |
| 1239 | 1266 | $param=$this->_prep_value($param); |
| 1240 | 1267 | $callback=""; |
| 1241 | - if ($jsCallback!="") |
|
| 1242 | - $callback=", function(event){\n{$jsCallback}\n}"; |
|
| 1268 | + if ($jsCallback!="") { |
|
| 1269 | + $callback=", function(event){\n{$jsCallback}\n}"; |
|
| 1270 | + } |
|
| 1243 | 1271 | $script="$(".$this->_prep_element($element).").".$jqueryCall."(".$param.$callback.");\n"; |
| 1244 | - if ($immediatly) |
|
| 1245 | - $this->jquery_code_for_compile[]=$script; |
|
| 1272 | + if ($immediatly) { |
|
| 1273 | + $this->jquery_code_for_compile[]=$script; |
|
| 1274 | + } |
|
| 1246 | 1275 | return $script; |
| 1247 | 1276 | } |
| 1248 | 1277 | |
@@ -1271,8 +1300,9 @@ discard block |
||
| 1271 | 1300 | */ |
| 1272 | 1301 | public function _exec($js, $immediatly=false) { |
| 1273 | 1302 | $script=$js."\n"; |
| 1274 | - if ($immediatly) |
|
| 1275 | - $this->jquery_code_for_compile[]=$script; |
|
| 1303 | + if ($immediatly) { |
|
| 1304 | + $this->jquery_code_for_compile[]=$script; |
|
| 1305 | + } |
|
| 1276 | 1306 | return $script; |
| 1277 | 1307 | } |
| 1278 | 1308 | |
@@ -1291,7 +1321,9 @@ discard block |
||
| 1291 | 1321 | } |
| 1292 | 1322 | |
| 1293 | 1323 | private function minify($input) { |
| 1294 | - if(trim($input) === "") return $input; |
|
| 1324 | + if(trim($input) === "") { |
|
| 1325 | + return $input; |
|
| 1326 | + } |
|
| 1295 | 1327 | return preg_replace( |
| 1296 | 1328 | array( |
| 1297 | 1329 | // Remove comment(s) |
