phpMv / phpMv-UI

Ajax/common/traits/JsUtilsAjaxTrait.php

Braces +23 added lines, -16 removed lines

@@ -60,8 +60,9 @@ 
 		$retour .= $this->_getOnAjaxDone ( $responseElement, $jqueryDone, $ajaxTransition, $jsCallback, $hasLoader, ($historize ? $originalSelector : null) ) . "});\n";
 
 		$retour = $this->_addJsCondition ( $jsCondition, $retour );
-		if ($immediatly)
-			$this->jquery_code_for_compile [] = $retour;
+		if ($immediatly) {
+					$this->jquery_code_for_compile [] = $retour;
+		}
 		return $retour;
 	}
 	protected function createAjaxParameters(&$original, $parameters) {
@@ -112,8 +113,9 @@ 
 				$retour .= "url=url+'" . $slash . "'+$(this).html();\n";
 			} elseif (\substr ( $attr, 0, 3 ) === "js:") {
 				$retour .= "url=url+'" . $slash . "'+" . \substr ( $attr, 3 ) . ";\n";
-			} elseif ($attr !== null && $attr !== "")
-				$retour .= "url=url+'" . $slash . "'+($(this).attr('" . $attr . "')||'');\n";
+			} elseif ($attr !== null && $attr !== "") {
+							$retour .= "url=url+'" . $slash . "'+($(this).attr('" . $attr . "')||'');\n";
+			}
 		}
 		return $retour;
 	}
@@ -134,10 +136,11 @@ 
 			} elseif (isset ( $this->ajaxTransition )) {
 				$call = $this->ajaxTransition;
 			}
-			if (\is_callable ( $call ))
-				$retour = "\t" . $call ( $responseElement, $jqueryDone ) . ";\n";
-			else
-				$retour = "\t{$responseElement}.{$jqueryDone}( data );\n";
+			if (\is_callable ( $call )) {
+							$retour = "\t" . $call ( $responseElement, $jqueryDone ) . ";\n";
+			} else {
+							$retour = "\t{$responseElement}.{$jqueryDone}( data );\n";
+			}
 		}
 		if (isset ( $history )) {
 			if ($this->params ["autoActiveLinks"]) {
@@ -158,8 +161,9 @@ 
 		return $responseElement;
 	}
 	protected function _correctAjaxUrl($url) {
-		if ($url !== "/" && JString::endsWith ( $url, "/" ) === true)
-			$url = substr ( $url, 0, strlen ( $url ) - 1 );
+		if ($url !== "/" && JString::endsWith ( $url, "/" ) === true) {
+					$url = substr ( $url, 0, strlen ( $url ) - 1 );
+		}
 		if (strncmp ( $url, 'http://', 7 ) != 0 && strncmp ( $url, 'https://', 8 ) != 0) {
 			$url = $this->getUrl ( $url );
 		}
@@ -181,8 +185,9 @@ 
 	public static function _implodeParams($parameters) {
 		$allParameters = [ ];
 		foreach ( $parameters as $params ) {
-			if (isset ( $params ))
-				$allParameters [] = self::_correctParams ( $params );
+			if (isset ( $params )) {
+							$allParameters [] = self::_correctParams ( $params );
+			}
 		}
 		return \implode ( "+'&'+", $allParameters );
 	}
@@ -212,8 +217,9 @@ 
 	}
 	protected function setDefaultParameters(&$parameters, $default) {
 		foreach ( $default as $k => $v ) {
-			if (! isset ( $parameters [$k] ))
-				$parameters [$k] = $v;
+			if (! isset ( $parameters [$k] )) {
+							$parameters [$k] = $v;
+			}
 		}
 	}
 	public function setAjaxLoader($loader) {
@@ -745,8 +751,9 @@ 
 			$retour .= "$('#" . $form . "').submit();\n";
 		}
 		$retour = $this->_addJsCondition ( $jsCondition, $retour );
-		if ($immediatly)
-			$this->jquery_code_for_compile [] = $retour;
+		if ($immediatly) {
+					$this->jquery_code_for_compile [] = $retour;
+		}
 		return $retour;
 	}
 

Ajax/common/traits/JsUtilsActionsTrait.php

Braces +36 added lines, -24 removed lines

@@ -34,8 +34,9 @@ 
 			$callback = ", function(){\n{$callback}\n}";
 		}
 		$str = "$({$element}).{$action}({$speed}{$callback});";
-		if ($immediatly)
-			$this->jquery_code_for_compile [] = $str;
+		if ($immediatly) {
+					$this->jquery_code_for_compile [] = $str;
+		}
 		return $str;
 	}
 
@@ -73,10 +74,12 @@ 
 		if (isset ( $param )) {
 			$param = Javascript::prep_value ( $param );
 			$str = "$({$element}).{$jQueryCall}({$param});";
-		} else
-			$str = "$({$element}).{$jQueryCall}();";
-		if ($immediatly)
-			$this->jquery_code_for_compile [] = $str;
+		} else {
+					$str = "$({$element}).{$jQueryCall}();";
+		}
+		if ($immediatly) {
+					$this->jquery_code_for_compile [] = $str;
+		}
 		return $str;
 	}
 
@@ -94,8 +97,9 @@ 
 		$to = Javascript::prep_element ( $to );
 		$element = Javascript::prep_element ( $element );
 		$str = "$({$to}).{$jQueryCall}({$element});";
-		if ($immediatly)
-			$this->jquery_code_for_compile [] = $str;
+		if ($immediatly) {
+					$this->jquery_code_for_compile [] = $str;
+		}
 		return $str;
 	}
 
@@ -153,10 +157,12 @@ 
 		if (isset ( $value )) {
 			$value = Javascript::prep_value ( $value );
 			$str = "$({$element}).attr(\"$attributeName\",{$value});";
-		} else
-			$str = "$({$element}).attr(\"$attributeName\");";
-		if ($immediatly)
-			$this->jquery_code_for_compile [] = $str;
+		} else {
+					$str = "$({$element}).attr(\"$attributeName\");";
+		}
+		if ($immediatly) {
+					$this->jquery_code_for_compile [] = $str;
+		}
 		return $str;
 	}
 
@@ -219,8 +225,9 @@ 
 
 		$str = "$({$element}).animate({\n$animations\n\t\t}" . $speed . $extra . ");";
 
-		if ($immediatly)
-			$this->jquery_code_for_compile [] = $str;
+		if ($immediatly) {
+					$this->jquery_code_for_compile [] = $str;
+		}
 		return $str;
 	}
 
@@ -410,8 +417,9 @@ 
 		$element = Javascript::prep_element ( $element );
 		$str = "$({$element}).trigger(\"$event\");";
 
-		if ($immediatly)
-			$this->jquery_code_for_compile [] = $str;
+		if ($immediatly) {
+					$this->jquery_code_for_compile [] = $str;
+		}
 		return $str;
 	}
 
@@ -481,8 +489,9 @@ 
 			$str .= "else{" . $jsCodeIfFalse . "}";
 		}
 
-		if ($immediatly)
-			$this->jquery_code_for_compile [] = $str;
+		if ($immediatly) {
+					$this->jquery_code_for_compile [] = $str;
+		}
 		return $str;
 	}
 
@@ -500,11 +509,13 @@ 
 	private function _doJQuery($element, $jqueryCall, $param = "", $jsCallback = "", $immediatly = false) {
 		$param = Javascript::prep_value ( $param );
 		$callback = "";
-		if ($jsCallback != "")
-			$callback = ", function(event){\n{$jsCallback}\n}";
+		if ($jsCallback != "") {
+					$callback = ", function(event){\n{$jsCallback}\n}";
+		}
 		$script = "$(" . Javascript::prep_element ( $element ) . ")." . $jqueryCall . "(" . $param . $callback . ");\n";
-		if ($immediatly)
-			$this->jquery_code_for_compile [] = $script;
+		if ($immediatly) {
+					$this->jquery_code_for_compile [] = $script;
+		}
 		return $script;
 	}
 
@@ -591,8 +602,9 @@ 
 	 */
 	public function exec($js, $immediatly = false) {
 		$script = $js . "\n";
-		if ($immediatly)
-			$this->jquery_code_for_compile [] = $script;
+		if ($immediatly) {
+					$this->jquery_code_for_compile [] = $script;
+		}
 		return $script;
 	}