View GitHub Repository phpMv-UI

Schedule Inspection
Subscribe
Passed
Push — master ( ccea9a...7a8d95 )
by Jean-Christophe
01:50
created
Status
Category
Toggle Patches
Ajax/common/traits/JsUtilsAjaxTrait.php 1 patch
Braces   +29 added lines, -22 removed lines patch added patch discarded remove patch 
@@ -32,7 +32,7 @@  discard block
 
 block discarded – undo
32 32 
 		$retour.="var self=this;\n";
33 33 
 		if($hasLoader===true && JString::isNotNull($responseElement)){
34 34 
 			$this->addLoading($retour, $responseElement,$ajaxLoader);
35 
-		}elseif($hasLoader==="internal"){
35 
+		} elseif($hasLoader==="internal"){
36 36 
 			$retour.="\n$(this).addClass('loading');";
37 37 
 		}
38 38 
 		$ajaxParameters=["url"=>"url","method"=>"'".\strtoupper($method)."'"];
 
@@ -49,8 +49,9 @@  discard block
 
 block discarded – undo
49 49 
 		$retour.="$.ajax({".$this->implodeAjaxParameters($ajaxParameters)."}).done(function( data, textStatus, jqXHR ) {\n";
50 50 
 		$retour.=$this->_getOnAjaxDone($responseElement, $jqueryDone,$ajaxTransition,$jsCallback,$hasLoader,($historize?$originalSelector:null))."});\n";
51 51 
 		$retour=$this->_addJsCondition($jsCondition,$retour);
52 
-		if ($immediatly)
53 
-			$this->jquery_code_for_compile[]=$retour;
52 
+		if ($immediatly) {
53 
+					$this->jquery_code_for_compile[]=$retour;
54 
+		}
54 55 
 		return $retour;
55 56 
 	}
56 57 
 
@@ -86,12 +87,13 @@  discard block
 
 block discarded – undo
86 87 
 		if(JString::isNotNull($attr)){
87 88 
 			if ($attr==="value"){
88 89 
 				$retour.="url=url+'".$slash."'+$(this).val();\n";
89 
-			}elseif ($attr==="html"){
90 
+			} elseif ($attr==="html"){
90 91 
 				$retour.="url=url+'".$slash."'+$(this).html();\n";
91 
-			}elseif(\substr($attr, 0,3)==="js:"){
92 
+			} elseif(\substr($attr, 0,3)==="js:"){
92 93 
 				$retour.="url=url+'".$slash."'+".\substr($attr, 3).";\n";
93 
-			}elseif($attr!==null && $attr!=="")
94 
-				$retour.="url=url+'".$slash."'+($(this).attr('".$attr."')||'');\n";
94 
+			} elseif($attr!==null && $attr!=="") {
95 
+							$retour.="url=url+'".$slash."'+($(this).attr('".$attr."')||'');\n";
96 
+			}
95 97 
 		}
96 98 
 		return $retour;
97 99 
 	}
 
@@ -111,13 +113,14 @@  discard block
 
 block discarded – undo
111 113 
 		if (JString::isNotNull($responseElement)) {
112 114 
 			if(isset($ajaxTransition)){
113 115 
 				$call=$this->setAjaxDataCall($ajaxTransition);
114 
-			}elseif(isset($this->ajaxTransition)){
116 
+			} elseif(isset($this->ajaxTransition)){
115 117 
 				$call=$this->ajaxTransition;
116 118 
 			}
117 
-			if(\is_callable($call))
118 
-				$retour="\t".$call($responseElement,$jqueryDone).";\n";
119 
-			else
120 
-				$retour="\t{$responseElement}.{$jqueryDone}( data );\n";
119 
+			if(\is_callable($call)) {
120 
+							$retour="\t".$call($responseElement,$jqueryDone).";\n";
121 
+			} else {
122 
+							$retour="\t{$responseElement}.{$jqueryDone}( data );\n";
123 
+			}
121 124 
 		}
122 125 
 		if(isset($history)){
123 126 
 			if($this->params["autoActiveLinks"]){
 
@@ -140,8 +143,9 @@  discard block
 
 block discarded – undo
140 143 
 	}
141 144
142 145 
 	protected function _correctAjaxUrl($url) {
143 
-		if ($url!=="/" && JString::endsWith($url, "/")===true)
144 
-			$url=substr($url, 0, strlen($url)-1);
146 
+		if ($url!=="/" && JString::endsWith($url, "/")===true) {
147 
+					$url=substr($url, 0, strlen($url)-1);
148 
+		}
145 149 
 			if (strncmp($url, 'http://', 7)!=0&&strncmp($url, 'https://', 8)!=0) {
146 150 
 				$url=$this->getUrl($url);
147 151 
 			}
 
@@ -161,8 +165,9 @@  discard block
 
 block discarded – undo
161 165 
 	public static function _implodeParams($parameters){
162 166 
 		$allParameters=[];
163 167 
 		foreach ($parameters as $params){
164 
-			if(isset($params))
165 
-				$allParameters[]=self::_correctParams($params);
168 
+			if(isset($params)) {
169 
+							$allParameters[]=self::_correctParams($params);
170 
+			}
166 171 
 		}
167 172 
 		return \implode("+'&'+", $allParameters);
168 173 
 	}
 
@@ -188,8 +193,9 @@  discard block
 
 block discarded – undo
188 193
189 194 
 	protected function setDefaultParameters(&$parameters,$default){
190 195 
 		foreach ($default as $k=>$v){
191 
-			if(!isset($parameters[$k]))
192 
-				$parameters[$k]=$v;
196 
+			if(!isset($parameters[$k])) {
197 
+							$parameters[$k]=$v;
198 
+			}
193 199 
 		}
194 200 
 	}
195 201 
 
@@ -307,7 +313,7 @@  discard block
 
 block discarded – undo
307 313 
 		if($context===null){
308 314 
 			$parent="$('".$maskSelector."').parent()";
309 315 
 			$newElm = "$('#'+newId)";
310 
-		}else{
316 
+		} else{
311 317 
 			$parent=$context;
312 318 
 			$newElm = $context.".find('#'+newId)";
313 319 
 		}
 
@@ -533,7 +539,7 @@  discard block
 
 block discarded – undo
533 539 
 		$retour.="var self=this;\n";
534 540 
 		if($hasLoader===true){
535 541 
 			$this->addLoading($retour, $responseElement,$ajaxLoader);
536 
-		}elseif($hasLoader==="internal"){
542 
+		} elseif($hasLoader==="internal"){
537 543 
 			$retour.="\n$(this).addClass('loading');";
538 544 
 		}
539 545 
 		$ajaxParameters=["url"=>"url","method"=>"'POST'","data"=>"params","async"=>$async];
 
@@ -551,8 +557,9 @@  discard block
 
 block discarded – undo
551 557 
 			$retour.="$('#".$form."').submit();\n";
552 558 
 		}
553 559 
 		$retour=$this->_addJsCondition($jsCondition, $retour);
554 
-		if ($immediatly)
555 
-			$this->jquery_code_for_compile[]=$retour;
560 
+		if ($immediatly) {
561 
+					$this->jquery_code_for_compile[]=$retour;
562 
+		}
556 563 
 		return $retour;
557 564 
 	}
558 565
Please login to merge, or discard this patch.