phpMv / phpMv-UI

Ajax/common/traits/JsUtilsActionsTrait.php

Doc Comments +5 added lines, -5 removed lines

@@ -13,7 +13,7 @@ 
 
 	/**
 	 * Ensures the speed parameter is valid for jQuery
-	 * @param string|int $speed
+	 * @param string $speed
 	 * @return string
 	 */
 	private function _validate_speed($speed) {
@@ -422,7 +422,7 @@ 
 	 *
 	 * @param string $element
 	 * @param array $options
-	 * @return void
+	 * @return string
 	 */
 	public function sortable($element, $options=array()) {
 		if (count($options)>0) {
@@ -493,7 +493,7 @@ 
 	 * @param string $jqueryCall the JQuery callback
 	 * @param mixed $param array or string parameters
 	 * @param string $jsCallback javascript code to execute after the jquery call
-	 * @return mixed
+	 * @return string
 	 */
 	public function doJQuery($element, $jqueryCall, $param="", $jsCallback="") {
 		return $this->_doJQuery($element, $jqueryCall, $param, $jsCallback, true);
@@ -505,7 +505,7 @@ 
 	 * @param string $jqueryCall the JQuery callback
 	 * @param mixed $param array or string parameters
 	 * @param string $jsCallback javascript code to execute after the jquery call
-	 * @return mixed
+	 * @return string
 	 */
 	public function doJQueryDeferred($element, $jqueryCall, $param="", $jsCallback="") {
 		return $this->_doJQuery($element, $jqueryCall, $param, $jsCallback, false);
@@ -517,7 +517,7 @@ 
 	 * @param string $element
 	 * @param string $elementToModify
 	 * @param string $jqueryCall
-	 * @param string|array $param
+	 * @param string $param
 	 * @param boolean $preventDefault
 	 * @param boolean $stopPropagation
 	 * @param string $jsCallback javascript code to execute after the jquery call

Braces +57 added lines, -38 removed lines

@@ -40,10 +40,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;
 	}
 
@@ -59,8 +61,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;
 	}
 	/**
@@ -109,10 +112,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;
 	}
 
@@ -168,8 +173,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;
 	}
 
@@ -214,8 +220,9 @@ 
 
 		$str="$({$element}).fadeIn({$speed}{$callback});";
 
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$str;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$str;
+		}
 		return $str;
 	}
 
@@ -238,8 +245,9 @@ 
 
 		$str="$({$element}).fadeOut({$speed}{$callback});";
 
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$str;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$str;
+		}
 		return $str;
 	}
 
@@ -262,8 +270,9 @@ 
 
 		$str="$({$element}).slideUp({$speed}{$callback});";
 
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$str;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$str;
+		}
 		return $str;
 	}
 
@@ -298,8 +307,9 @@ 
 
 		$str="$({$element}).slideDown({$speed}{$callback});";
 
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$str;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$str;
+		}
 		return $str;
 	}
 
@@ -322,8 +332,9 @@ 
 
 		$str="$({$element}).slideToggle({$speed}{$callback});";
 
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$str;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$str;
+		}
 		return $str;
 	}
 
@@ -346,8 +357,9 @@ 
 
 		$str="$({$element}).hide({$speed}{$callback});";
 
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$str;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$str;
+		}
 		return $str;
 	}
 
@@ -362,8 +374,9 @@ 
 		$element=Javascript::prep_element($element);
 		$str="$({$element}).toggle();";
 
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$str;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$str;
+		}
 		return $str;
 	}
 
@@ -388,8 +401,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;
 	}
 
@@ -412,8 +426,9 @@ 
 
 		$str="$({$element}).show({$speed}{$callback});";
 
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$str;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$str;
+		}
 		return $str;
 	}
 
@@ -462,8 +477,9 @@ 
 			$str.="else{".$jsCodeIfFalse."}";
 		}
 
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$str;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$str;
+		}
 		return $str;
 	}
 
@@ -479,11 +495,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;
 	}
 
@@ -554,8 +572,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;
 	}
 

Ajax/common/traits/JsUtilsAjaxTrait.php

Doc Comments +31 added lines

@@ -16,8 +16,17 @@ 
 	protected $ajaxLoader='<span></span><span></span><span></span><span></span><span></span>';
 
 	abstract public function getUrl($url);
+
+	/**
+	 * @param string $element
+	 * @param string $js
+	 * @param string $event
+	 */
 	abstract public function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false,$immediatly=true);
 
+	/**
+	 * @param string $method
+	 */
 	protected function _ajax($method,$url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true,$jqueryDone="html",$ajaxTransition=null,$immediatly=false) {
 		if(JString::isNull($params)){$params="{}";}
 		$jsCallback=isset($jsCallback) ? $jsCallback : "";
@@ -36,6 +45,9 @@ 
 
 
 
+	/**
+	 * @param string $attr
+	 */
 	protected function _getAjaxUrl($url,$attr){
 		$url=$this->_correctAjaxUrl($url);
 		$retour="url='".$url."';";
@@ -53,6 +65,9 @@ 
 			return $retour;
 	}
 
+	/**
+	 * @param string $jqueryDone
+	 */
 	protected function _getOnAjaxDone($responseElement,$jqueryDone,$ajaxTransition,$jsCallback){
 		$retour="";$call=null;
 		if ($responseElement!=="") {
@@ -86,6 +101,9 @@ 
 			return $url;
 	}
 
+	/**
+	 * @param string $retour
+	 */
 	protected function addLoading(&$retour, $responseElement) {
 		$loading_notifier='<div class="ajax-loader">';
 		if ($this->ajaxLoader=='') {
@@ -252,6 +270,7 @@ 
 	 * @param string $rowClass the css class for the new element
 	 * @param string $context jquery DOM element, array container.
 	 * @param boolean $immediatly
+	 * @param string $maskSelector
 	 */
 	public function jsonArray($maskSelector, $url, $method="get", $params="{}", $jsCallback=NULL,$rowClass="_json",$context=NULL,$immediatly=false) {
 		return $this->_jsonArray($maskSelector, $url,$method,$params,$jsCallback,$rowClass,$context,NULL,$immediatly);
@@ -342,6 +361,11 @@ 
 		return $this->getOn("click", $element, $url, $responseElement, $parameters);
 	}
 
+	/**
+	 * @param string $url
+	 * @param string $jsCallback
+	 * @param callable $ajaxTransition
+	 */
 	private function _post($url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true,$jqueryDone="html",$ajaxTransition=null,$immediatly=false) {
 		return $this->_ajax("post", $url,$params,$responseElement,$jsCallback,$attr,$hasLoader,$jqueryDone,$ajaxTransition,$immediatly);
 	}
@@ -412,6 +436,13 @@ 
 		return $this->postOn("click", $element, $url, $params, $responseElement, $parameters);
 	}
 
+	/**
+	 * @param string $url
+	 * @param string $form
+	 * @param string $responseElement
+	 * @param string $jsCallback
+	 * @param callable $ajaxTransition
+	 */
 	private function _postForm($url, $form, $responseElement, $validation=false, $jsCallback=NULL, $attr="id", $hasLoader=true,$jqueryDone="html",$ajaxTransition=null,$immediatly=false) {
 		$jsCallback=isset($jsCallback) ? $jsCallback : "";
 		$retour=$this->_getAjaxUrl($url, $attr);

Braces +32 added lines, -24 removed lines

@@ -29,8 +29,9 @@ 
 		}
 		$retour.="$.".$method."(url,".$params.").done(function( data ) {\n";
 		$retour.=$this->_getOnAjaxDone($responseElement, $jqueryDone,$ajaxTransition,$jsCallback)."});\n";
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$retour;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$retour;
+		}
 			return $retour;
 	}
 
@@ -40,15 +41,17 @@ 
 		$url=$this->_correctAjaxUrl($url);
 		$retour="url='".$url."';";
 		$slash="/";
-		if(JString::endswith($url, "/")===true)
-			$slash="";
+		if(JString::endswith($url, "/")===true) {
+					$slash="";
+		}
 			if(JString::isNotNull($attr)){
-				if ($attr==="value")
-					$retour.="url=url+'".$slash."'+$(this).val();\n";
-				elseif ($attr==="html")
-					$retour.="url=url+'".$slash."'+$(this).html();\n";
-				elseif($attr!==null && $attr!=="")
-					$retour.="url=url+'".$slash."'+($(this).attr('".$attr."')||'');\n";
+				if ($attr==="value") {
+									$retour.="url=url+'".$slash."'+$(this).val();\n";
+				} elseif ($attr==="html") {
+									$retour.="url=url+'".$slash."'+$(this).html();\n";
+				} elseif($attr!==null && $attr!=="") {
+									$retour.="url=url+'".$slash."'+($(this).attr('".$attr."')||'');\n";
+				}
 			}
 			return $retour;
 	}
@@ -58,13 +61,14 @@ 
 		if ($responseElement!=="") {
 			if(isset($ajaxTransition)){
 				$call=$this->setAjaxDataCall($ajaxTransition);
-			}elseif(isset($this->ajaxTransition)){
+			} 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";
+				}
 		}
 		$retour.="\t".$jsCallback."\n";
 		return $retour;
@@ -78,8 +82,9 @@ 
 	}
 
 	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);
 			}
@@ -159,8 +164,9 @@ 
 				$retour.="\t".$jsCallback."\n".
 						"\t$(document).trigger('jsonReady',[data]);\n".
 						"});\n";
-				if ($immediatly)
-					$this->jquery_code_for_compile[]=$retour;
+				if ($immediatly) {
+									$this->jquery_code_for_compile[]=$retour;
+				}
 		return $retour;
 	}
 
@@ -225,7 +231,7 @@ 
 		if($context===null){
 			$parent="$('".$maskSelector."').parent()";
 			$newElm = "$('#'+newId)";
-		}else{
+		} else{
 			$parent=$context;
 			$newElm = $context.".find('#'+newId)";
 		}
@@ -238,8 +244,9 @@ 
 		$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";
 		$retour.="\t$(document).trigger('jsonReady',[data]);\n";
 		$retour.="\t".$jsCallback."\n"."});\n";
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$retour;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$retour;
+		}
 		return $retour;
 	}
 
@@ -430,8 +437,9 @@ 
 			}});\n";
 			$retour.="$('#".$form."').submit();\n";
 		}
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$retour;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$retour;
+		}
 		return $retour;
 	}
 

Ajax/common/traits/JsUtilsEventsTrait.php

Braces +8 added lines, -6 removed lines

@@ -34,12 +34,14 @@
 		if ($stopPropagation===true) {
 			$js=Javascript::$stopPropagation.$js;
 		}
-		if (array_search($event, $this->jquery_events)===false)
-			$event="\n\t$(".Javascript::prep_element($element).").bind('{$event}',function(event){\n\t\t{$js}\n\t});\n";
-			else
-				$event="\n\t$(".Javascript::prep_element($element).").{$event}(function(event){\n\t\t{$js}\n\t});\n";
-				if($immediatly)
-					$this->jquery_code_for_compile[]=$event;
+		if (array_search($event, $this->jquery_events)===false) {
+					$event="\n\t$(".Javascript::prep_element($element).").bind('{$event}',function(event){\n\t\t{$js}\n\t});\n";
+		} else {
+							$event="\n\t$(".Javascript::prep_element($element).").{$event}(function(event){\n\t\t{$js}\n\t});\n";
+			}
+				if($immediatly) {
+									$this->jquery_code_for_compile[]=$event;
+				}
 					return $event;
 	}
 

Ajax/common/traits/JsUtilsInternalTrait.php

Braces +6 added lines, -3 removed lines

@@ -16,8 +16,9 @@ 
 	 */
 	private function _compileLibrary($library, &$view=NULL){
 		if ($library!=NULL) {
-			if(isset($view))
-				$library->compileHtml($this, $view);
+			if(isset($view)) {
+							$library->compileHtml($this, $view);
+			}
 			if ($library->isAutoCompile()) {
 				$library->compile(true);
 			}
@@ -37,7 +38,9 @@ 
 	}
 
 	private function minify($input) {
-		if(trim($input) === "") return $input;
+		if(trim($input) === "") {
+			return $input;
+		}
 		return preg_replace(
 				array(
 						// Remove comment(s)