Completed
Pull Request — master (#2)
by Antoine
03:05
created
Ajax/Jquery.php 1 patch
Spacing   +59 added lines, -59 removed lines patch added patch discarded remove patch
@@ -21,14 +21,14 @@  discard block
 block discarded – undo
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) {
@@ -161,7 +161,7 @@  discard block
 block discarded – undo
161 161
 	 */
162 162
 	public function _click($element='this', $js=array(), $ret_false=TRUE) {
163 163
 		if (!is_array($js)) {
164
-			$js=array (
164
+			$js=array(
165 165
 					$js
166 166
 			);
167 167
 		}
@@ -356,12 +356,12 @@  discard block
 block discarded – undo
356 356
 	 */
357 357
 	public function _output($array_js='') {
358 358
 		if (!is_array($array_js)) {
359
-			$array_js=array (
359
+			$array_js=array(
360 360
 					$array_js
361 361
 			);
362 362
 		}
363 363
 
364
-		foreach ( $array_js as $js ) {
364
+		foreach ($array_js as $js) {
365 365
 			$this->jquery_code_for_compile[]="\t$js\n";
366 366
 		}
367 367
 	}
@@ -416,7 +416,7 @@  discard block
 block discarded – undo
416 416
 	 * @param boolean $immediatly defers the execution if set to false
417 417
 	 * @return string
418 418
 	 */
419
-	public function after($element='this', $value='', $immediatly=false){
419
+	public function after($element='this', $value='', $immediatly=false) {
420 420
 		$element=$this->_prep_element($element);
421 421
 		$value=$this->_prep_value($value);
422 422
 		$str="$({$element}).after({$value});";
@@ -437,7 +437,7 @@  discard block
 block discarded – undo
437 437
 		if (isset($value)) {
438 438
 			$value=$this->_prep_value($value);
439 439
 			$str="$({$element}).attr(\"$attributeName\",{$value});";
440
-		} else
440
+		}else
441 441
 			$str="$({$element}).attr(\"$attributeName\");";
442 442
 		if ($immediatly)
443 443
 			$this->jquery_code_for_compile[]=$str;
@@ -451,12 +451,12 @@  discard block
 block discarded – undo
451 451
 	 * @param string $param
452 452
 	 * @param boolean $immediatly delayed if false
453 453
 	 */
454
-	public function _genericCallValue($jQueryCall,$element='this', $param="", $immediatly=false) {
454
+	public function _genericCallValue($jQueryCall, $element='this', $param="", $immediatly=false) {
455 455
 		$element=$this->_prep_element($element);
456 456
 		if (isset($param)) {
457 457
 			$param=$this->_prep_value($param);
458 458
 			$str="$({$element}).{$jQueryCall}({$param});";
459
-		} else
459
+		}else
460 460
 			$str="$({$element}).{$jQueryCall}();";
461 461
 			if ($immediatly)
462 462
 				$this->jquery_code_for_compile[]=$str;
@@ -470,7 +470,7 @@  discard block
 block discarded – undo
470 470
 	 * @param boolean $immediatly delayed if false
471 471
 	 * @return string
472 472
 	 */
473
-	public function _genericCallElement($jQueryCall,$to='this', $element, $immediatly=false) {
473
+	public function _genericCallElement($jQueryCall, $to='this', $element, $immediatly=false) {
474 474
 		$to=$this->_prep_element($to);
475 475
 		$element=$this->_prep_element($element);
476 476
 		$str="$({$to}).{$jQueryCall}({$element});";
@@ -496,7 +496,7 @@  discard block
 block discarded – undo
496 496
 
497 497
 		$animations="\t\t\t";
498 498
 		if (is_array($params)) {
499
-			foreach ( $params as $param => $value ) {
499
+			foreach ($params as $param => $value) {
500 500
 				$animations.=$param.': \''.$value.'\', ';
501 501
 			}
502 502
 		}
@@ -768,12 +768,12 @@  discard block
 block discarded – undo
768 768
 	 */
769 769
 	public function sortable($element, $options=array()) {
770 770
 		if (count($options)>0) {
771
-			$sort_options=array ();
772
-			foreach ( $options as $k => $v ) {
771
+			$sort_options=array();
772
+			foreach ($options as $k => $v) {
773 773
 				$sort_options[]="\n\t\t".$k.': '.$v."";
774 774
 			}
775 775
 			$sort_options=implode(",", $sort_options);
776
-		} else {
776
+		}else {
777 777
 			$sort_options='';
778 778
 		}
779 779
 
@@ -854,7 +854,7 @@  discard block
 block discarded – undo
854 854
 
855 855
 		// External references
856 856
 		$external_scripts=implode('', $this->jquery_code_for_load);
857
-		extract(array (
857
+		extract(array(
858 858
 				'library_src' => $external_scripts
859 859
 		));
860 860
 
@@ -887,7 +887,7 @@  discard block
 block discarded – undo
887 887
 	 * @return void
888 888
 	 */
889 889
 	public function _clear_compile() {
890
-		$this->jquery_code_for_compile=array ();
890
+		$this->jquery_code_for_compile=array();
891 891
 	}
892 892
 
893 893
 	// --------------------------------------------------------------------
@@ -899,12 +899,12 @@  discard block
 block discarded – undo
899 899
 	 */
900 900
 	public function _document_ready($js) {
901 901
 		if (!is_array($js)) {
902
-			$js=array (
902
+			$js=array(
903 903
 					$js
904 904
 			);
905 905
 		}
906 906
 
907
-		foreach ( $js as $script ) {
907
+		foreach ($js as $script) {
908 908
 			$this->jquery_code_for_compile[]=$script;
909 909
 		}
910 910
 	}
@@ -920,7 +920,7 @@  discard block
 block discarded – undo
920 920
 	 * @return string
921 921
 	 */
922 922
 	public function _prep_element($element) {
923
-		if (strrpos($element, 'this')===false&&strrpos($element, 'event')===false&&strrpos($element, 'self')===false) {
923
+		if (strrpos($element, 'this')===false && strrpos($element, 'event')===false && strrpos($element, 'self')===false) {
924 924
 			$element='"'.addslashes($element).'"';
925 925
 		}
926 926
 		return $element;
@@ -938,7 +938,7 @@  discard block
 block discarded – undo
938 938
 		if (is_array($value)) {
939 939
 			$value=implode(",", $value);
940 940
 		}
941
-		if (strrpos($value, 'this')===false&&strrpos($value, 'event')===false&&strrpos($value, 'self')===false) {
941
+		if (strrpos($value, 'this')===false && strrpos($value, 'event')===false && strrpos($value, 'self')===false) {
942 942
 			$value='"'.$value.'"';
943 943
 		}
944 944
 		return $value;
@@ -953,8 +953,8 @@  discard block
 block discarded – undo
953 953
 	 * @return string
954 954
 	 */
955 955
 	private function _validate_speed($speed) {
956
-		if (in_array($speed, array (
957
-				'slow','normal','fast'
956
+		if (in_array($speed, array(
957
+				'slow', 'normal', 'fast'
958 958
 		))) {
959 959
 			$speed='"'.$speed.'"';
960 960
 		} elseif (preg_match("/[^0-9]/", $speed)) {
@@ -968,7 +968,7 @@  discard block
 block discarded – undo
968 968
 		$loading_notifier='<div class="ajax-loader">';
969 969
 		if ($this->ajaxLoader=='') {
970 970
 			$loading_notifier.="Loading...";
971
-		} else {
971
+		}else {
972 972
 			$loading_notifier.=$this->ajaxLoader;
973 973
 		}
974 974
 		$loading_notifier.='</div>';
@@ -976,20 +976,20 @@  discard block
 block discarded – undo
976 976
 		$retour.="\t\t$({$responseElement}).prepend('{$loading_notifier}');\n";
977 977
 	}
978 978
 
979
-	public function _get($url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true,$immediatly=false) {
980
-		return $this->_ajax("get", $url,$params,$responseElement,$jsCallback,$attr,$hasLoader,$immediatly);
979
+	public function _get($url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true, $immediatly=false) {
980
+		return $this->_ajax("get", $url, $params, $responseElement, $jsCallback, $attr, $hasLoader, $immediatly);
981 981
 	}
982
-	public function _post($url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true,$immediatly=false) {
983
-		return $this->_ajax("post", $url,$params,$responseElement,$jsCallback,$attr,$hasLoader,$immediatly);
982
+	public function _post($url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true, $immediatly=false) {
983
+		return $this->_ajax("post", $url, $params, $responseElement, $jsCallback, $attr, $hasLoader, $immediatly);
984 984
 	}
985 985
 
986
-	protected function _ajax($method,$url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true,$immediatly=false) {
987
-		if(JString::isNull($params)){$params="{}";}
986
+	protected function _ajax($method, $url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true, $immediatly=false) {
987
+		if (JString::isNull($params)) {$params="{}"; }
988 988
 		$jsCallback=isset($jsCallback) ? $jsCallback : "";
989 989
 		$retour=$this->_getAjaxUrl($url, $attr);
990 990
 		$responseElement=$this->_getResponseElement($responseElement);
991 991
 		$retour.="var self=this;\n";
992
-		if($hasLoader===true){
992
+		if ($hasLoader===true) {
993 993
 			$this->addLoading($retour, $responseElement);
994 994
 		}
995 995
 		$retour.="$.".$method."(url,".$params.").done(function( data ) {\n";
@@ -999,22 +999,22 @@  discard block
 block discarded – undo
999 999
 		return $retour;
1000 1000
 	}
1001 1001
 
1002
-	protected function _getAjaxUrl($url,$attr){
1002
+	protected function _getAjaxUrl($url, $attr) {
1003 1003
 		$url=$this->_correctAjaxUrl($url);
1004 1004
 		$retour="url='".$url."';\n";
1005 1005
 		$slash="/";
1006
-		if(PhalconUtils::endsWith($url, "/"))
1006
+		if (PhalconUtils::endsWith($url, "/"))
1007 1007
 			$slash="";
1008
-		if(JString::isNotNull($attr)){
1008
+		if (JString::isNotNull($attr)) {
1009 1009
 			if ($attr=="value")
1010 1010
 				$retour.="url=url+'".$slash."'+$(this).val();\n";
1011
-			else if($attr!=null && $attr!=="")
1011
+			else if ($attr!=null && $attr!=="")
1012 1012
 				$retour.="url=url+'".$slash."'+$(this).attr('".$attr."');\n";
1013 1013
 		}
1014 1014
 		return $retour;
1015 1015
 	}
1016 1016
 
1017
-	protected function _getOnAjaxDone($responseElement,$jsCallback){
1017
+	protected function _getOnAjaxDone($responseElement, $jsCallback) {
1018 1018
 		$retour="";
1019 1019
 		if ($responseElement!=="") {
1020 1020
 			$retour="\t$({$responseElement}).html( data );\n";
@@ -1023,7 +1023,7 @@  discard block
 block discarded – undo
1023 1023
 		return $retour;
1024 1024
 	}
1025 1025
 	
1026
-	protected function _getResponseElement($responseElement){
1026
+	protected function _getResponseElement($responseElement) {
1027 1027
 		if ($responseElement!=="") {
1028 1028
 			$responseElement=$this->_prep_value($responseElement);
1029 1029
 		}
@@ -1033,7 +1033,7 @@  discard block
 block discarded – undo
1033 1033
 	protected function _correctAjaxUrl($url) {
1034 1034
 		if (PhalconUtils::endsWith($url, "/"))
1035 1035
 			$url=substr($url, 0, strlen($url)-1);
1036
-		if (strncmp($url, 'http://', 7)!=0&&strncmp($url, 'https://', 8)!=0) {
1036
+		if (strncmp($url, 'http://', 7)!=0 && strncmp($url, 'https://', 8)!=0) {
1037 1037
 			$url=$this->_di->get("url")->get($url);
1038 1038
 		}
1039 1039
 		return $url;
@@ -1046,7 +1046,7 @@  discard block
 block discarded – undo
1046 1046
 	 * @param string $method Method use
1047 1047
 	 * @param string $jsCallback javascript code to execute after the request
1048 1048
 	 */
1049
-	public function _json($url, $method="get", $params="{}", $jsCallback=NULL, $attr="id", $context="document",$immediatly=false) {
1049
+	public function _json($url, $method="get", $params="{}", $jsCallback=NULL, $attr="id", $context="document", $immediatly=false) {
1050 1050
 		$jsCallback=isset($jsCallback) ? $jsCallback : "";
1051 1051
 		$retour=$this->_getAjaxUrl($url, $attr);
1052 1052
 		$retour.="$.{$method}(url,".$params.").done(function( data ) {\n";
@@ -1066,7 +1066,7 @@  discard block
 block discarded – undo
1066 1066
 	 * @param string $url the request address
1067 1067
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","params"=>"{}","method"=>"get")
1068 1068
 	 */
1069
-	public function _jsonOn($event,$element, $url,$parameters=array()) {
1069
+	public function _jsonOn($event, $element, $url, $parameters=array()) {
1070 1070
 		$preventDefault=true;
1071 1071
 		$stopPropagation=true;
1072 1072
 		$jsCallback=null;
@@ -1075,7 +1075,7 @@  discard block
 block discarded – undo
1075 1075
 		$context="document";
1076 1076
 		$params="{}";
1077 1077
 		extract($parameters);
1078
-		return $this->_add_event($element, $this->_json($url,$method, $params,$jsCallback, $attr,$context), $event, $preventDefault, $stopPropagation);
1078
+		return $this->_add_event($element, $this->_json($url, $method, $params, $jsCallback, $attr, $context), $event, $preventDefault, $stopPropagation);
1079 1079
 	}
1080 1080
 
1081 1081
 	/**
@@ -1086,19 +1086,19 @@  discard block
 block discarded – undo
1086 1086
 	 * @param string $jsCallback javascript code to execute after the request
1087 1087
 	 * @param string $context jquery DOM element, array container.
1088 1088
 	 */
1089
-	public function _jsonArray($maskSelector, $url, $method="get", $params="{}", $jsCallback=NULL, $attr="id", $context=null,$immediatly=false) {
1089
+	public function _jsonArray($maskSelector, $url, $method="get", $params="{}", $jsCallback=NULL, $attr="id", $context=null, $immediatly=false) {
1090 1090
 		$jsCallback=isset($jsCallback) ? $jsCallback : "";
1091 1091
 		$retour=$this->_getAjaxUrl($url, $attr);
1092
-		if($context==null){
1092
+		if ($context==null) {
1093 1093
 			$appendTo="\t\tnewElm.appendTo($('".$maskSelector."').parent());\n";
1094
-			$newElm = "$('#'+newId)";
1095
-		}else{
1094
+			$newElm="$('#'+newId)";
1095
+		}else {
1096 1096
 			$appendTo="\t\tnewElm.appendTo(".$context.");\n";
1097
-			$newElm = $context.".find('#'+newId)";
1097
+			$newElm=$context.".find('#'+newId)";
1098 1098
 		}
1099 1099
 		$retour.="var self = $(this);\n$.{$method}(url,".$params.").done(function( data ) {\n";
1100 1100
 		$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";
1101
-		$retour.= $appendTo;
1101
+		$retour.=$appendTo;
1102 1102
 		$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";
1103 1103
 
1104 1104
 		$retour.="\t".$jsCallback."\n"."});\n";
@@ -1113,25 +1113,25 @@  discard block
 block discarded – undo
1113 1113
 	 * @param string $url the request address
1114 1114
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","params"=>"{}","method"=>"get", "context"=>null)
1115 1115
 	 */
1116
-	public function _jsonArrayOn($event,$element, $maskSelector,$url,$parameters=array()) {
1116
+	public function _jsonArrayOn($event, $element, $maskSelector, $url, $parameters=array()) {
1117 1117
 		$preventDefault=true;
1118 1118
 		$stopPropagation=true;
1119 1119
 		$jsCallback=null;
1120 1120
 		$attr="id";
1121 1121
 		$method="get";
1122
-		$context = null;
1122
+		$context=null;
1123 1123
 		$params="{}";
1124 1124
 		extract($parameters);
1125
-		return $this->_add_event($element, $this->_jsonArray($maskSelector,$url,$method, $params,$jsCallback, $attr, $context), $event, $preventDefault, $stopPropagation);
1125
+		return $this->_add_event($element, $this->_jsonArray($maskSelector, $url, $method, $params, $jsCallback, $attr, $context), $event, $preventDefault, $stopPropagation);
1126 1126
 	}
1127 1127
 	
1128
-	public function _postForm($url, $form, $responseElement, $validation=false, $jsCallback=NULL, $attr="id", $hasLoader=true,$immediatly=false) {
1128
+	public function _postForm($url, $form, $responseElement, $validation=false, $jsCallback=NULL, $attr="id", $hasLoader=true, $immediatly=false) {
1129 1129
 		$jsCallback=isset($jsCallback) ? $jsCallback : "";
1130 1130
 		$retour=$this->_getAjaxUrl($url, $attr);
1131 1131
 		$retour.="\nvar params=$('#".$form."').serialize();\n";
1132 1132
 		$responseElement=$this->_getResponseElement($responseElement);
1133 1133
 		$retour.="var self=this;\n";
1134
-		if($hasLoader===true){
1134
+		if ($hasLoader===true) {
1135 1135
 			$this->addLoading($retour, $responseElement);
1136 1136
 		}
1137 1137
 		$retour.="$.post(url,params).done(function( data ) {\n";
@@ -1158,14 +1158,14 @@  discard block
 block discarded – undo
1158 1158
 	 * @param string $responseElement
1159 1159
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true)
1160 1160
 	 */
1161
-	public function _getOn($event,$element, $url, $params="{}", $responseElement="", $parameters=array()) {
1161
+	public function _getOn($event, $element, $url, $params="{}", $responseElement="", $parameters=array()) {
1162 1162
 		$preventDefault=true;
1163 1163
 		$stopPropagation=true;
1164 1164
 		$jsCallback=null;
1165 1165
 		$attr="id";
1166 1166
 		$hasLoader=true;
1167 1167
 		extract($parameters);
1168
-		return $this->_add_event($element, $this->_get($url, $params, $responseElement, $jsCallback, $attr,$hasLoader), $event, $preventDefault, $stopPropagation);
1168
+		return $this->_add_event($element, $this->_get($url, $params, $responseElement, $jsCallback, $attr, $hasLoader), $event, $preventDefault, $stopPropagation);
1169 1169
 	}
1170 1170
 
1171 1171
 	/**
@@ -1178,14 +1178,14 @@  discard block
 block discarded – undo
1178 1178
 	 * @param string $responseElement
1179 1179
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true)
1180 1180
 	 */
1181
-	public function _postOn($event,$element, $url, $params="{}", $responseElement="", $parameters=array()) {
1181
+	public function _postOn($event, $element, $url, $params="{}", $responseElement="", $parameters=array()) {
1182 1182
 		$preventDefault=true;
1183 1183
 		$stopPropagation=true;
1184 1184
 		$jsCallback=null;
1185 1185
 		$attr="id";
1186 1186
 		$hasLoader=true;
1187 1187
 		extract($parameters);
1188
-		return $this->_add_event($element, $this->_post($url, $params, $responseElement, $jsCallback, $attr,$hasLoader), $event, $preventDefault, $stopPropagation);
1188
+		return $this->_add_event($element, $this->_post($url, $params, $responseElement, $jsCallback, $attr, $hasLoader), $event, $preventDefault, $stopPropagation);
1189 1189
 	}
1190 1190
 
1191 1191
 	/**
@@ -1198,7 +1198,7 @@  discard block
 block discarded – undo
1198 1198
 	 * @param string $responseElement
1199 1199
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"validation"=>false,"jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true)
1200 1200
 	 */
1201
-	public function _postFormOn($event,$element, $url, $form, $responseElement="", $parameters=array()) {
1201
+	public function _postFormOn($event, $element, $url, $form, $responseElement="", $parameters=array()) {
1202 1202
 		$preventDefault=true;
1203 1203
 		$stopPropagation=true;
1204 1204
 		$validation=false;
@@ -1206,7 +1206,7 @@  discard block
 block discarded – undo
1206 1206
 		$attr="id";
1207 1207
 		$hasLoader=true;
1208 1208
 		extract($parameters);
1209
-		return $this->_add_event($element, $this->_postForm($url, $form, $responseElement, $validation, $jsCallback, $attr,$hasLoader), $event, $preventDefault, $stopPropagation);
1209
+		return $this->_add_event($element, $this->_postForm($url, $form, $responseElement, $validation, $jsCallback, $attr, $hasLoader), $event, $preventDefault, $stopPropagation);
1210 1210
 	}
1211 1211
 
1212 1212
 	/**
Please login to merge, or discard this patch.