phpMv / phpMv-UI

Ajax/common/traits/JsUtilsEventsTrait.php

Spacing +48 added lines, -48 removed lines

@@ -10,7 +10,7 @@ 
  * @property array $jquery_code_for_compile
  */
 trait JsUtilsEventsTrait {
-	protected $jquery_events = array (
+	protected $jquery_events=array(
 			"bind",
 			"blur",
 			"change",
@@ -50,7 +50,7 @@ 
 			"undelegate",
 			"unload"
 	);
-	abstract public function _add_event($element, $js, $event, $preventDefault = false, $stopPropagation = false, $immediatly = true);
+	abstract public function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false, $immediatly=true);
 
 	/**
 	 * Outputs a javascript library blur event
@@ -61,8 +61,8 @@ 
 	 *        	code to execute
 	 * @return string
 	 */
-	public function blur($element = 'this', $js = '') {
-		return $this->_add_event ( $element, $js, 'blur' );
+	public function blur($element='this', $js='') {
+		return $this->_add_event($element, $js, 'blur');
 	}
 
 	/**
@@ -76,8 +76,8 @@ 
 	 * @param boolean $stopPropagation
 	 * @return string
 	 */
-	public function change($element = 'this', $js = '', $preventDefault = false, $stopPropagation = false) {
-		return $this->_add_event ( $element, $js, 'change', $preventDefault, $stopPropagation );
+	public function change($element='this', $js='', $preventDefault=false, $stopPropagation=false) {
+		return $this->_add_event($element, $js, 'change', $preventDefault, $stopPropagation);
 	}
 
 	/**
@@ -93,18 +93,18 @@ 
 	 * @param boolean $stopPropagation
 	 * @return string
 	 */
-	public function click($element = 'this', $js = '', $ret_false = TRUE, $preventDefault = false, $stopPropagation = false) {
-		if (! is_array ( $js )) {
-			$js = array (
+	public function click($element='this', $js='', $ret_false=TRUE, $preventDefault=false, $stopPropagation=false) {
+		if (!is_array($js)) {
+			$js=array(
 					$js
 			);
 		}
 
 		if ($ret_false) {
-			$js [] = "return false;";
+			$js []="return false;";
 		}
 
-		return $this->_add_event ( $element, $js, 'click', $preventDefault, $stopPropagation );
+		return $this->_add_event($element, $js, 'click', $preventDefault, $stopPropagation);
 	}
 
 	/**
@@ -116,8 +116,8 @@ 
 	 *        	code to execute
 	 * @return string
 	 */
-	public function contextmenu($element = 'this', $js = '') {
-		return $this->_add_event ( $element, $js, 'contextmenu' );
+	public function contextmenu($element='this', $js='') {
+		return $this->_add_event($element, $js, 'contextmenu');
 	}
 
 	/**
@@ -129,8 +129,8 @@ 
 	 *        	code to execute
 	 * @return string
 	 */
-	public function dblclick($element = 'this', $js = '') {
-		return $this->_add_event ( $element, $js, 'dblclick' );
+	public function dblclick($element='this', $js='') {
+		return $this->_add_event($element, $js, 'dblclick');
 	}
 
 	/**
@@ -142,8 +142,8 @@ 
 	 *        	code to execute
 	 * @return string
 	 */
-	public function error($element = 'this', $js = '') {
-		return $this->_add_event ( $element, $js, 'error' );
+	public function error($element='this', $js='') {
+		return $this->_add_event($element, $js, 'error');
 	}
 
 	/**
@@ -155,8 +155,8 @@ 
 	 *        	code to execute
 	 * @return string
 	 */
-	public function focus($element = 'this', $js = '') {
-		return $this->_add_event ( $element, $js, 'focus' );
+	public function focus($element='this', $js='') {
+		return $this->_add_event($element, $js, 'focus');
 	}
 
 	/**
@@ -169,9 +169,9 @@ 
 	 *        	code for mouse out
 	 * @return string
 	 */
-	public function hover($element = 'this', $over = '', $out = '') {
-		$event = "\n\t$(" . Javascript::prep_element ( $element ) . ").hover(\n\t\tfunction()\n\t\t{\n\t\t\t{$over}\n\t\t}, \n\t\tfunction()\n\t\t{\n\t\t\t{$out}\n\t\t});\n";
-		$this->jquery_code_for_compile [] = $event;
+	public function hover($element='this', $over='', $out='') {
+		$event="\n\t$(".Javascript::prep_element($element).").hover(\n\t\tfunction()\n\t\t{\n\t\t\t{$over}\n\t\t}, \n\t\tfunction()\n\t\t{\n\t\t\t{$out}\n\t\t});\n";
+		$this->jquery_code_for_compile []=$event;
 		return $event;
 	}
 
@@ -184,8 +184,8 @@ 
 	 *        	code to execute
 	 * @return string
 	 */
-	public function keydown($element = 'this', $js = '') {
-		return $this->_add_event ( $element, $js, 'keydown' );
+	public function keydown($element='this', $js='') {
+		return $this->_add_event($element, $js, 'keydown');
 	}
 
 	/**
@@ -197,8 +197,8 @@ 
 	 *        	code to execute
 	 * @return string
 	 */
-	public function keypress($element = 'this', $js = '') {
-		return $this->_add_event ( $element, $js, 'keypress' );
+	public function keypress($element='this', $js='') {
+		return $this->_add_event($element, $js, 'keypress');
 	}
 
 	/**
@@ -210,8 +210,8 @@ 
 	 *        	code to execute
 	 * @return string
 	 */
-	public function keyup($element = 'this', $js = '') {
-		return $this->_add_event ( $element, $js, 'keyup' );
+	public function keyup($element='this', $js='') {
+		return $this->_add_event($element, $js, 'keyup');
 	}
 
 	/**
@@ -223,8 +223,8 @@ 
 	 *        	code to execute
 	 * @return string
 	 */
-	public function load($element = 'this', $js = '') {
-		return $this->_add_event ( $element, $js, 'load' );
+	public function load($element='this', $js='') {
+		return $this->_add_event($element, $js, 'load');
 	}
 
 	/**
@@ -236,8 +236,8 @@ 
 	 *        	code to execute
 	 * @return string
 	 */
-	public function mousedown($element = 'this', $js = '') {
-		return $this->_add_event ( $element, $js, 'mousedown' );
+	public function mousedown($element='this', $js='') {
+		return $this->_add_event($element, $js, 'mousedown');
 	}
 
 	/**
@@ -249,8 +249,8 @@ 
 	 *        	code to execute
 	 * @return string
 	 */
-	public function mouseout($element = 'this', $js = '', $preventDefault = false, $stopPropagation = false) {
-		return $this->_add_event ( $element, $js, 'mouseout', $preventDefault, $stopPropagation );
+	public function mouseout($element='this', $js='', $preventDefault=false, $stopPropagation=false) {
+		return $this->_add_event($element, $js, 'mouseout', $preventDefault, $stopPropagation);
 	}
 
 	/**
@@ -262,8 +262,8 @@ 
 	 *        	code to execute
 	 * @return string
 	 */
-	public function mouseleave($element = 'this', $js = '', $preventDefault = false, $stopPropagation = false) {
-		return $this->_add_event ( $element, $js, 'mouseleave', $preventDefault, $stopPropagation );
+	public function mouseleave($element='this', $js='', $preventDefault=false, $stopPropagation=false) {
+		return $this->_add_event($element, $js, 'mouseleave', $preventDefault, $stopPropagation);
 	}
 
 	/**
@@ -275,8 +275,8 @@ 
 	 *        	code to execute
 	 * @return string
 	 */
-	public function mouseenter($element = 'this', $js = '', $preventDefault = false, $stopPropagation = false) {
-		return $this->_add_event ( $element, $js, 'mouseenter', $preventDefault, $stopPropagation );
+	public function mouseenter($element='this', $js='', $preventDefault=false, $stopPropagation=false) {
+		return $this->_add_event($element, $js, 'mouseenter', $preventDefault, $stopPropagation);
 	}
 
 	/**
@@ -288,8 +288,8 @@ 
 	 *        	code to execute
 	 * @return string
 	 */
-	public function mouseover($element = 'this', $js = '') {
-		return $this->_add_event ( $element, $js, 'mouseover' );
+	public function mouseover($element='this', $js='') {
+		return $this->_add_event($element, $js, 'mouseover');
 	}
 
 	/**
@@ -301,8 +301,8 @@ 
 	 *        	code to execute
 	 * @return string
 	 */
-	public function mouseup($element = 'this', $js = '') {
-		return $this->_add_event ( $element, $js, 'mouseup' );
+	public function mouseup($element='this', $js='') {
+		return $this->_add_event($element, $js, 'mouseup');
 	}
 
 	/**
@@ -314,8 +314,8 @@ 
 	 *        	code to execute
 	 * @return string
 	 */
-	public function unload($element = 'this', $js = '') {
-		return $this->_add_event ( $element, $js, 'unload' );
+	public function unload($element='this', $js='') {
+		return $this->_add_event($element, $js, 'unload');
 	}
 
 	// --------------------------------------------------------------------
@@ -328,8 +328,8 @@ 
 	 *        	code to execute
 	 * @return string
 	 */
-	public function resize($element = 'this', $js = '') {
-		return $this->_add_event ( $element, $js, 'resize' );
+	public function resize($element='this', $js='') {
+		return $this->_add_event($element, $js, 'resize');
 	}
 
 	// --------------------------------------------------------------------
@@ -342,7 +342,7 @@ 
 	 *        	code to execute
 	 * @return string
 	 */
-	public function scroll($element = 'this', $js = '') {
-		return $this->_add_event ( $element, $js, 'scroll' );
+	public function scroll($element='this', $js='') {
+		return $this->_add_event($element, $js, 'scroll');
 	}
 }

Ajax/common/traits/JsUtilsAjaxTrait.php

Spacing +283 added lines, -283 removed lines

@@ -14,210 +14,210 @@ 
  */
 trait JsUtilsAjaxTrait {
 	protected $ajaxTransition;
-	protected $ajaxLoader = "<div class=\"ui active centered inline text loader\">Loading</div>";
+	protected $ajaxLoader="<div class=\"ui active centered inline text loader\">Loading</div>";
 	abstract public function getUrl($url);
-	abstract public function _add_event($element, $js, $event, $preventDefault = false, $stopPropagation = false, $immediatly = true);
-	abstract public function interval($jsCode, $time, $globalName = null, $immediatly = true);
-	protected function _ajax($method, $url, $responseElement = "", $parameters = [ ]) {
-		if (isset ( $this->params ["ajax"] )) {
-			extract ( $this->params ["ajax"] );
-		}
-		extract ( $parameters );
-
-		$jsCallback = isset ( $jsCallback ) ? $jsCallback : "";
-		$retour = $this->_getAjaxUrl ( $url, $attr );
-		$originalSelector = $responseElement;
-		$responseElement = $this->_getResponseElement ( $responseElement );
-		$retour .= "var self=this;\n";
-		$before = isset ( $before ) ? $before : "";
-		$retour .= $before;
-		if ($hasLoader === true && JString::isNotNull ( $responseElement )) {
-			$this->addLoading ( $retour, $responseElement, $ajaxLoader );
-		} elseif ($hasLoader === 'response') {
-			$this->addResponseLoading ( $retour, $responseElement, $ajaxLoader );
-		} elseif ($hasLoader === 'internal') {
-			$retour .= "\n$(this).addClass('loading');";
-		}
-		$ajaxParameters = [ 
+	abstract public function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false, $immediatly=true);
+	abstract public function interval($jsCode, $time, $globalName=null, $immediatly=true);
+	protected function _ajax($method, $url, $responseElement="", $parameters=[]) {
+		if (isset ($this->params ["ajax"])) {
+			extract($this->params ["ajax"]);
+		}
+		extract($parameters);
+
+		$jsCallback=isset ($jsCallback) ? $jsCallback : "";
+		$retour=$this->_getAjaxUrl($url, $attr);
+		$originalSelector=$responseElement;
+		$responseElement=$this->_getResponseElement($responseElement);
+		$retour.="var self=this;\n";
+		$before=isset ($before) ? $before : "";
+		$retour.=$before;
+		if ($hasLoader===true && JString::isNotNull($responseElement)) {
+			$this->addLoading($retour, $responseElement, $ajaxLoader);
+		} elseif ($hasLoader==='response') {
+			$this->addResponseLoading($retour, $responseElement, $ajaxLoader);
+		} elseif ($hasLoader==='internal') {
+			$retour.="\n$(this).addClass('loading');";
+		}
+		$ajaxParameters=[ 
 				"url" => "url",
-				"method" => "'" . \strtoupper ( $method ) . "'"
+				"method" => "'".\strtoupper($method)."'"
 		];
 
-		$ajaxParameters ["async"] = ($async ? "true" : "false");
+		$ajaxParameters ["async"]=($async ? "true" : "false");
 
-		if (isset ( $params )) {
-			$ajaxParameters ["data"] = self::_correctParams ( $params, $parameters );
+		if (isset ($params)) {
+			$ajaxParameters ["data"]=self::_correctParams($params, $parameters);
 		}
-		if (isset ( $headers )) {
-			$ajaxParameters ["headers"] = $headers;
+		if (isset ($headers)) {
+			$ajaxParameters ["headers"]=$headers;
 		}
-		if (isset ( $partial )) {
-			$ajaxParameters ["xhr"] = "xhrProvider";
-			$retour .= "var xhr = $.ajaxSettings.xhr();function xhrProvider() {return xhr;};xhr.onreadystatechange = function (e) { if (3==e.target.readyState){let response=e.target.responseText;" . $partial . ";}; };";
+		if (isset ($partial)) {
+			$ajaxParameters ["xhr"]="xhrProvider";
+			$retour.="var xhr = $.ajaxSettings.xhr();function xhrProvider() {return xhr;};xhr.onreadystatechange = function (e) { if (3==e.target.readyState){let response=e.target.responseText;".$partial.";}; };";
 		}
-		$this->createAjaxParameters ( $ajaxParameters, $parameters );
-		$retour .= "$.ajax({" . $this->implodeAjaxParameters ( $ajaxParameters ) . "}).done(function( data, textStatus, jqXHR ) {\n";
-		$retour .= $this->_getOnAjaxDone ( $responseElement, $jqueryDone, $ajaxTransition, $jsCallback, $hasLoader, ($historize ? $originalSelector : null) ) . "});\n";
+		$this->createAjaxParameters($ajaxParameters, $parameters);
+		$retour.="$.ajax({".$this->implodeAjaxParameters($ajaxParameters)."}).done(function( data, textStatus, jqXHR ) {\n";
+		$retour.=$this->_getOnAjaxDone($responseElement, $jqueryDone, $ajaxTransition, $jsCallback, $hasLoader, ($historize ? $originalSelector : null))."});\n";
 
-		$retour = $this->_addJsCondition ( $jsCondition, $retour );
+		$retour=$this->_addJsCondition($jsCondition, $retour);
 		if ($immediatly)
-			$this->jquery_code_for_compile [] = $retour;
+			$this->jquery_code_for_compile []=$retour;
 		return $retour;
 	}
 	protected function createAjaxParameters(&$original, $parameters) {
-		$validParameters = [ 
+		$validParameters=[ 
 				"contentType" => "%value%",
 				"dataType" => "'%value%'",
 				"beforeSend" => "function(jqXHR,settings){%value%}",
 				"complete" => "function(jqXHR){%value%}",
 				"processData" => "%value%"
 		];
-		foreach ( $validParameters as $param => $mask ) {
-			if (isset ( $parameters [$param] )) {
-				$original [$param] = \str_replace ( "%value%", $parameters [$param], $mask );
+		foreach ($validParameters as $param => $mask) {
+			if (isset ($parameters [$param])) {
+				$original [$param]=\str_replace("%value%", $parameters [$param], $mask);
 			}
 		}
 	}
 	protected function implodeAjaxParameters($ajaxParameters) {
-		$s = '';
-		foreach ( $ajaxParameters as $k => $v ) {
-			if ($s !== '') {
-				$s .= ',';
+		$s='';
+		foreach ($ajaxParameters as $k => $v) {
+			if ($s!=='') {
+				$s.=',';
 			}
-			if (is_array ( $v )) {
-				$s .= "'{$k}':{" . self::implodeAjaxParameters ( $v ) . "}";
+			if (is_array($v)) {
+				$s.="'{$k}':{".self::implodeAjaxParameters($v)."}";
 			} else {
-				$s .= "'{$k}':{$v}";
+				$s.="'{$k}':{$v}";
 			}
 		}
 		return $s;
 	}
 	protected function _addJsCondition($jsCondition, $jsSource) {
-		if (isset ( $jsCondition )) {
-			return "if(" . $jsCondition . "){\n" . $jsSource . "\n}";
+		if (isset ($jsCondition)) {
+			return "if(".$jsCondition."){\n".$jsSource."\n}";
 		}
 		return $jsSource;
 	}
 	protected function _getAjaxUrl($url, $attr) {
-		$url = $this->_correctAjaxUrl ( $url );
-		$retour = "url='" . $url . "';";
-		$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 (\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";
+		$url=$this->_correctAjaxUrl($url);
+		$retour="url='".$url."';";
+		$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 (\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";
 		}
 		return $retour;
 	}
 	protected function onPopstate() {
 		return "window.onpopstate = function(e){if(e.state){var target=e.state.jqueryDone;$(e.state.selector)[target](e.state.html);}};";
 	}
-	protected function autoActiveLinks($previousURL = "window.location.href") {
-		$result = "\nfunction getHref(url) { return \$('a').filter(function(){return \$(this).prop('href') == url; });}";
-		$result .= "\nvar myurl={$previousURL};if(window._previousURL) getHref(window._previousURL).removeClass('active');getHref(myurl).addClass('active');window._previousURL=myurl;";
+	protected function autoActiveLinks($previousURL="window.location.href") {
+		$result="\nfunction getHref(url) { return \$('a').filter(function(){return \$(this).prop('href') == url; });}";
+		$result.="\nvar myurl={$previousURL};if(window._previousURL) getHref(window._previousURL).removeClass('active');getHref(myurl).addClass('active');window._previousURL=myurl;";
 		return $result;
 	}
-	protected function _getOnAjaxDone($responseElement, $jqueryDone, $ajaxTransition, $jsCallback, $hasLoader = false, $history = null) {
-		$retour = "";
-		$call = null;
-		if (JString::isNotNull ( $responseElement )) {
-			if (isset ( $ajaxTransition )) {
-				$call = $this->setAjaxDataCall ( $ajaxTransition );
-			} elseif (isset ( $this->ajaxTransition )) {
-				$call = $this->ajaxTransition;
+	protected function _getOnAjaxDone($responseElement, $jqueryDone, $ajaxTransition, $jsCallback, $hasLoader=false, $history=null) {
+		$retour="";
+		$call=null;
+		if (JString::isNotNull($responseElement)) {
+			if (isset ($ajaxTransition)) {
+				$call=$this->setAjaxDataCall($ajaxTransition);
+			} elseif (isset ($this->ajaxTransition)) {
+				$call=$this->ajaxTransition;
 			}
-			if (\is_callable ( $call ))
-				$retour = "\t" . $call ( $responseElement, $jqueryDone ) . ";\n";
+			if (\is_callable($call))
+				$retour="\t".$call($responseElement, $jqueryDone).";\n";
 			else
-				$retour = "\t{$responseElement}.{$jqueryDone}( data );\n";
+				$retour="\t{$responseElement}.{$jqueryDone}( data );\n";
 		}
-		if (isset ( $history )) {
+		if (isset ($history)) {
 			if ($this->params ["autoActiveLinks"]) {
-				$retour .= $this->autoActiveLinks ( "url" );
+				$retour.=$this->autoActiveLinks("url");
 			}
-			$retour .= "\nwindow.history.pushState({'html':data,'selector':" . Javascript::prep_value ( $history ) . ",'jqueryDone':'{$jqueryDone}'},'', url);";
+			$retour.="\nwindow.history.pushState({'html':data,'selector':".Javascript::prep_value($history).",'jqueryDone':'{$jqueryDone}'},'', url);";
 		}
-		if ($hasLoader === "internal") {
-			$retour .= "\n$(self).removeClass('loading');";
+		if ($hasLoader==="internal") {
+			$retour.="\n$(self).removeClass('loading');";
 		}
-		$retour .= "\t" . $jsCallback . "\n";
+		$retour.="\t".$jsCallback."\n";
 		return $retour;
 	}
 	protected function _getResponseElement($responseElement) {
-		if (JString::isNotNull ( $responseElement )) {
-			$responseElement = Javascript::prep_jquery_selector ( $responseElement );
+		if (JString::isNotNull($responseElement)) {
+			$responseElement=Javascript::prep_jquery_selector($responseElement);
 		}
 		return $responseElement;
 	}
 	protected function _correctAjaxUrl($url) {
-		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 );
+		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);
 		}
 		return $url;
 	}
-	public static function _correctParams($params, $ajaxParameters = [ ]) {
-		if (JString::isNull ( $params )) {
+	public static function _correctParams($params, $ajaxParameters=[]) {
+		if (JString::isNull($params)) {
 			return "";
 		}
-		if (\preg_match ( "@^\{.*?\}$@", $params )) {
-			if (! isset ( $ajaxParameters ['contentType'] ) || ! JString::contains ( $ajaxParameters ['contentType'], 'json' )) {
-				return '$.param(' . $params . ')';
+		if (\preg_match("@^\{.*?\}$@", $params)) {
+			if (!isset ($ajaxParameters ['contentType']) || !JString::contains($ajaxParameters ['contentType'], 'json')) {
+				return '$.param('.$params.')';
 			} else {
-				return 'JSON.stringify(' . $params . ')';
+				return 'JSON.stringify('.$params.')';
 			}
 		}
 		return $params;
 	}
 	public static function _implodeParams($parameters) {
-		$allParameters = [ ];
-		foreach ( $parameters as $params ) {
-			if (isset ( $params ))
-				$allParameters [] = self::_correctParams ( $params );
+		$allParameters=[];
+		foreach ($parameters as $params) {
+			if (isset ($params))
+				$allParameters []=self::_correctParams($params);
 		}
-		return \implode ( "+'&'+", $allParameters );
+		return \implode("+'&'+", $allParameters);
 	}
-	protected function addLoading(&$retour, $responseElement, $ajaxLoader = null) {
-		if (! isset ( $ajaxLoader )) {
-			$ajaxLoader = $this->ajaxLoader;
+	protected function addLoading(&$retour, $responseElement, $ajaxLoader=null) {
+		if (!isset ($ajaxLoader)) {
+			$ajaxLoader=$this->ajaxLoader;
 		}
-		$loading_notifier = '<div class="ajax-loader ui active inverted dimmer">' . $ajaxLoader . '</div>';
-		$retour .= "\t\t{$responseElement}.append('{$loading_notifier}');\n";
+		$loading_notifier='<div class="ajax-loader ui active inverted dimmer">'.$ajaxLoader.'</div>';
+		$retour.="\t\t{$responseElement}.append('{$loading_notifier}');\n";
 	}
-	protected function addResponseLoading(&$retour, $responseElement, $ajaxLoader = null) {
-		if (! isset ( $ajaxLoader )) {
-			$ajaxLoader = $this->ajaxLoader;
+	protected function addResponseLoading(&$retour, $responseElement, $ajaxLoader=null) {
+		if (!isset ($ajaxLoader)) {
+			$ajaxLoader=$this->ajaxLoader;
 		}
-		$loading_notifier = '<div class="ajax-loader">' . $ajaxLoader . '</div>';
-		$retour .= "{$responseElement}.empty();\n";
-		$retour .= "\t\t{$responseElement}.prepend('{$loading_notifier}');\n";
+		$loading_notifier='<div class="ajax-loader">'.$ajaxLoader.'</div>';
+		$retour.="{$responseElement}.empty();\n";
+		$retour.="\t\t{$responseElement}.prepend('{$loading_notifier}');\n";
 	}
 	protected function setAjaxDataCall($params) {
-		$result = null;
-		if (! \is_callable ( $params )) {
-			$result = function ($responseElement, $jqueryDone = "html") use ($params) {
-				return AjaxTransition::{$params} ( $responseElement, $jqueryDone );
+		$result=null;
+		if (!\is_callable($params)) {
+			$result=function($responseElement, $jqueryDone="html") use ($params) {
+				return AjaxTransition::{$params} ($responseElement, $jqueryDone);
 			};
 		}
 		return $result;
 	}
 	protected function setDefaultParameters(&$parameters, $default) {
-		foreach ( $default as $k => $v ) {
-			if (! isset ( $parameters [$k] ))
-				$parameters [$k] = $v;
+		foreach ($default as $k => $v) {
+			if (!isset ($parameters [$k]))
+				$parameters [$k]=$v;
 		}
 	}
 	public function setAjaxLoader($loader) {
-		$this->ajaxLoader = $loader;
+		$this->ajaxLoader=$loader;
 	}
 
 	/**
@@ -228,8 +228,8 @@ 
 	 * @param string $responseElement
 	 *        	selector of the HTML element displaying the answer
 	 */
-	private function _get($url, $responseElement = "", $parameters = [ ]) {
-		return $this->_ajax ( "get", $url, $responseElement, $parameters );
+	private function _get($url, $responseElement="", $parameters=[]) {
+		return $this->_ajax("get", $url, $responseElement, $parameters);
 	}
 
 	/**
@@ -242,9 +242,9 @@ 
 	 * @param array $parameters
 	 *        	default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null,"historize"=>false,"before"=>null)
 	 */
-	public function get($url, $responseElement = "", $parameters = [ ]) {
-		$parameters ["immediatly"] = true;
-		return $this->_get ( $url, $responseElement, $parameters );
+	public function get($url, $responseElement="", $parameters=[]) {
+		$parameters ["immediatly"]=true;
+		return $this->_get($url, $responseElement, $parameters);
 	}
 
 	/**
@@ -259,9 +259,9 @@ 
 	 * @param array $parameters
 	 *        	default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null,"historize"=>false,"before"=>null)
 	 */
-	public function ajax($method, $url, $responseElement = "", $parameters = [ ]) {
-		$parameters ["immediatly"] = true;
-		return $this->_ajax ( $method, $url, $responseElement, $parameters );
+	public function ajax($method, $url, $responseElement="", $parameters=[]) {
+		$parameters ["immediatly"]=true;
+		return $this->_ajax($method, $url, $responseElement, $parameters);
 	}
 
 	/**
@@ -282,8 +282,8 @@ 
 	 *        	$immediatly
 	 * @return string
 	 */
-	public function ajaxInterval($method, $url, $interval, $globalName = null, $responseElement = "", $parameters = [ ], $immediatly = true) {
-		return $this->interval ( $this->ajaxDeferred ( $method, $url, $responseElement, $parameters ), $interval, $globalName, $immediatly );
+	public function ajaxInterval($method, $url, $interval, $globalName=null, $responseElement="", $parameters=[], $immediatly=true) {
+		return $this->interval($this->ajaxDeferred($method, $url, $responseElement, $parameters), $interval, $globalName, $immediatly);
 	}
 
 	/**
@@ -298,9 +298,9 @@ 
 	 * @param array $parameters
 	 *        	default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null,"historize"=>false,"before"=>null)
 	 */
-	public function ajaxDeferred($method, $url, $responseElement = "", $parameters = [ ]) {
-		$parameters ["immediatly"] = false;
-		return $this->_ajax ( $method, $url, $responseElement, $parameters );
+	public function ajaxDeferred($method, $url, $responseElement="", $parameters=[]) {
+		$parameters ["immediatly"]=false;
+		return $this->_ajax($method, $url, $responseElement, $parameters);
 	}
 
 	/**
@@ -313,16 +313,16 @@ 
 	 * @param array $parameters
 	 *        	default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","context"=>"document","jsCondition"=>NULL,"headers"=>null,"immediatly"=>false,"before"=>null)
 	 */
-	private function _json($url, $method = "get", $parameters = [ ]) {
-		$parameters = \array_merge ( $parameters, [ 
+	private function _json($url, $method="get", $parameters=[]) {
+		$parameters=\array_merge($parameters, [ 
 				"hasLoader" => false
-		] );
-		$jsCallback = isset ( $parameters ['jsCallback'] ) ? $parameters ['jsCallback'] : "";
-		$context = isset ( $parameters ['context'] ) ? $parameters ['context'] : "document";
-		$retour = "\tdata=($.isPlainObject(data))?data:JSON.parse(data);\t" . $jsCallback . ";" . "\n\tfor(var key in data){" . "if($('#'+key," . $context . ").length){ if($('#'+key," . $context . ").is('[value]')) { $('#'+key," . $context . ").val(data[key]);} else { $('#'+key," . $context . ").html(data[key]); }}};\n";
-		$retour .= "\t$(document).trigger('jsonReady',[data]);\n";
-		$parameters ["jsCallback"] = $retour;
-		return $this->_ajax ( $method, $url, null, $parameters );
+		]);
+		$jsCallback=isset ($parameters ['jsCallback']) ? $parameters ['jsCallback'] : "";
+		$context=isset ($parameters ['context']) ? $parameters ['context'] : "document";
+		$retour="\tdata=($.isPlainObject(data))?data:JSON.parse(data);\t".$jsCallback.";"."\n\tfor(var key in data){"."if($('#'+key,".$context.").length){ if($('#'+key,".$context.").is('[value]')) { $('#'+key,".$context.").val(data[key]);} else { $('#'+key,".$context.").html(data[key]); }}};\n";
+		$retour.="\t$(document).trigger('jsonReady',[data]);\n";
+		$parameters ["jsCallback"]=$retour;
+		return $this->_ajax($method, $url, null, $parameters);
 	}
 
 	/**
@@ -335,8 +335,8 @@ 
 	 * @param array $parameters
 	 *        	default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","context"=>"document","jsCondition"=>NULL,"headers"=>null,"immediatly"=>false,"before"=>null)
 	 */
-	public function json($url, $method = "get", $parameters = [ ]) {
-		return $this->_json ( $url, $method, $parameters );
+	public function json($url, $method="get", $parameters=[]) {
+		return $this->_json($url, $method, $parameters);
 	}
 
 	/**
@@ -351,13 +351,13 @@ 
 	 * @param array $parameters
 	 *        	default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","params"=>"{}","method"=>"get","immediatly"=>true,"before"=>null)
 	 */
-	public function jsonOn($event, $element, $url, $method = "get", $parameters = array ()) {
-		$this->setDefaultParameters ( $parameters, [ 
+	public function jsonOn($event, $element, $url, $method="get", $parameters=array()) {
+		$this->setDefaultParameters($parameters, [ 
 				"preventDefault" => true,
 				"stopPropagation" => true,
 				"immediatly" => true
-		] );
-		return $this->_add_event ( $element, $this->jsonDeferred ( $url, $method, $parameters ), $event, $parameters ["preventDefault"], $parameters ["stopPropagation"], $parameters ["immediatly"] );
+		]);
+		return $this->_add_event($element, $this->jsonDeferred($url, $method, $parameters), $event, $parameters ["preventDefault"], $parameters ["stopPropagation"], $parameters ["immediatly"]);
 	}
 
 	/**
@@ -370,9 +370,9 @@ 
 	 * @param array $parameters
 	 *        	default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","context"=>"document","jsCondition"=>NULL,"headers"=>null,"immediatly"=>false,"before"=>null)
 	 */
-	public function jsonDeferred($url, $method = "get", $parameters = [ ]) {
-		$parameters ["immediatly"] = false;
-		return $this->_json ( $url, $method, $parameters );
+	public function jsonDeferred($url, $method="get", $parameters=[]) {
+		$parameters ["immediatly"]=false;
+		return $this->_json($url, $method, $parameters);
 	}
 
 	/**
@@ -386,30 +386,30 @@ 
 	 * @param array $parameters
 	 *        	default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","context"=>null,"jsCondition"=>NULL,"headers"=>null,"immediatly"=>false,"rowClass"=>"_json","before"=>null)
 	 */
-	private function _jsonArray($maskSelector, $url, $method = "get", $parameters = [ ]) {
-		$parameters = \array_merge ( $parameters, [ 
+	private function _jsonArray($maskSelector, $url, $method="get", $parameters=[]) {
+		$parameters=\array_merge($parameters, [ 
 				"hasLoader" => false
-		] );
-		$rowClass = isset ( $parameters ['rowClass'] ) ? $parameters ['rowClass'] : "_json";
-		$jsCallback = isset ( $parameters ['jsCallback'] ) ? $parameters ['jsCallback'] : "";
-		$context = isset ( $parameters ['context'] ) ? $parameters ['context'] : null;
-		if ($context === null) {
-			$parent = "$('" . $maskSelector . "').parent()";
-			$newElm = "$('#'+newId)";
+		]);
+		$rowClass=isset ($parameters ['rowClass']) ? $parameters ['rowClass'] : "_json";
+		$jsCallback=isset ($parameters ['jsCallback']) ? $parameters ['jsCallback'] : "";
+		$context=isset ($parameters ['context']) ? $parameters ['context'] : null;
+		if ($context===null) {
+			$parent="$('".$maskSelector."').parent()";
+			$newElm="$('#'+newId)";
 		} else {
-			$parent = $context;
-			$newElm = $context . ".find('#'+newId)";
+			$parent=$context;
+			$newElm=$context.".find('#'+newId)";
 		}
-		$appendTo = "\t\tnewElm.appendTo(" . $parent . ");\n";
-		$retour = $parent . ".find('.{$rowClass}').remove();";
-		$retour .= "\tdata=($.isPlainObject(data)||$.isArray(data))?data:JSON.parse(data);\n$.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();
+		$appendTo="\t\tnewElm.appendTo(".$parent.");\n";
+		$retour=$parent.".find('.{$rowClass}').remove();";
+		$retour.="\tdata=($.isPlainObject(data)||$.isArray(data))?data:JSON.parse(data);\n$.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;newElm.addClass('{$rowClass}').removeClass('_jsonArrayModel');\nnewElm.find('[id]').each(function(){ var newId=$(this).attr('id')+'-'+index;$(this).attr('id',newId).removeClass('_jsonArrayChecked');});\n";
-		$retour .= $appendTo;
-		$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;
-		$parameters ["jsCallback"] = $retour;
-		return $this->_ajax ( $method, $url, null, $parameters );
+		$retour.=$appendTo;
+		$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;
+		$parameters ["jsCallback"]=$retour;
+		return $this->_ajax($method, $url, null, $parameters);
 	}
 
 	/**
@@ -423,8 +423,8 @@ 
 	 * @param array $parameters
 	 *        	default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","context"=>null,"jsCondition"=>NULL,"headers"=>null,"immediatly"=>false,"rowClass"=>"_json","before"=>null)
 	 */
-	public function jsonArray($maskSelector, $url, $method = "get", $parameters = [ ]) {
-		return $this->_jsonArray ( $maskSelector, $url, $method, $parameters );
+	public function jsonArray($maskSelector, $url, $method="get", $parameters=[]) {
+		return $this->_jsonArray($maskSelector, $url, $method, $parameters);
 	}
 
 	/**
@@ -438,9 +438,9 @@ 
 	 * @param array $parameters
 	 *        	default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","context"=>null,"jsCondition"=>NULL,"headers"=>null,"rowClass"=>"_json","before"=>null)
 	 */
-	public function jsonArrayDeferred($maskSelector, $url, $method = "get", $parameters = [ ]) {
-		$parameters ["immediatly"] = false;
-		return $this->jsonArray ( $maskSelector, $url, $method, $parameters );
+	public function jsonArrayDeferred($maskSelector, $url, $method="get", $parameters=[]) {
+		$parameters ["immediatly"]=false;
+		return $this->jsonArray($maskSelector, $url, $method, $parameters);
 	}
 
 	/**
@@ -455,13 +455,13 @@ 
 	 * @param array $parameters
 	 *        	default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","params"=>"{}","method"=>"get","rowClass"=>"_json","immediatly"=>true,"before"=>null)
 	 */
-	public function jsonArrayOn($event, $element, $maskSelector, $url, $method = "get", $parameters = array ()) {
-		$this->setDefaultParameters ( $parameters, [ 
+	public function jsonArrayOn($event, $element, $maskSelector, $url, $method="get", $parameters=array()) {
+		$this->setDefaultParameters($parameters, [ 
 				"preventDefault" => true,
 				"stopPropagation" => true,
 				"immediatly" => true
-		] );
-		return $this->_add_event ( $element, $this->jsonArrayDeferred ( $maskSelector, $url, $method, $parameters ), $event, $parameters ["preventDefault"], $parameters ["stopPropagation"], $parameters ["immediatly"] );
+		]);
+		return $this->_add_event($element, $this->jsonArrayDeferred($maskSelector, $url, $method, $parameters), $event, $parameters ["preventDefault"], $parameters ["stopPropagation"], $parameters ["immediatly"]);
 	}
 
 	/**
@@ -475,9 +475,9 @@ 
 	 * @param array $parameters
 	 *        	default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null,"historize"=>false,"before"=>null)
 	 */
-	public function getDeferred($url, $responseElement = "", $parameters = [ ]) {
-		$parameters ["immediatly"] = false;
-		return $this->_get ( $url, $responseElement, $parameters );
+	public function getDeferred($url, $responseElement="", $parameters=[]) {
+		$parameters ["immediatly"]=false;
+		return $this->_get($url, $responseElement, $parameters);
 	}
 
 	/**
@@ -495,13 +495,13 @@ 
 	 * @param array $parameters
 	 *        	default : array("preventDefault"=>true,"stopPropagation"=>true,"params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>null,"headers"=>null,"historize"=>false,"before"=>null)
 	 */
-	public function getOn($event, $element, $url, $responseElement = "", $parameters = array ()) {
-		$this->setDefaultParameters ( $parameters, [ 
+	public function getOn($event, $element, $url, $responseElement="", $parameters=array()) {
+		$this->setDefaultParameters($parameters, [ 
 				"preventDefault" => true,
 				"stopPropagation" => true,
 				"immediatly" => true
-		] );
-		return $this->_add_event ( $element, $this->getDeferred ( $url, $responseElement, $parameters ), $event, $parameters ["preventDefault"], $parameters ["stopPropagation"], $parameters ["immediatly"] );
+		]);
+		return $this->_add_event($element, $this->getDeferred($url, $responseElement, $parameters), $event, $parameters ["preventDefault"], $parameters ["stopPropagation"], $parameters ["immediatly"]);
 	}
 
 	/**
@@ -519,14 +519,14 @@ 
 	 * @param array $parameters
 	 *        	default : array("method"=>"get","preventDefault"=>true,"stopPropagation"=>true,"params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","jsCondition"=>NULL,"headers"=>null,"historize"=>false,"before"=>null)
 	 */
-	public function ajaxOn($event, $element, $url, $responseElement = "", $parameters = array ()) {
-		$this->setDefaultParameters ( $parameters, [ 
+	public function ajaxOn($event, $element, $url, $responseElement="", $parameters=array()) {
+		$this->setDefaultParameters($parameters, [ 
 				"preventDefault" => true,
 				"stopPropagation" => true,
 				"immediatly" => true,
 				"method" => "get"
-		] );
-		return $this->_add_event ( $element, $this->ajaxDeferred ( $parameters ["method"], $url, $responseElement, $parameters ), $event, $parameters ["preventDefault"], $parameters ["stopPropagation"], $parameters ["immediatly"] );
+		]);
+		return $this->_add_event($element, $this->ajaxDeferred($parameters ["method"], $url, $responseElement, $parameters), $event, $parameters ["preventDefault"], $parameters ["stopPropagation"], $parameters ["immediatly"]);
 	}
 
 	/**
@@ -542,8 +542,8 @@ 
 	 * @param array $parameters
 	 *        	default : array("method"=>"get","preventDefault"=>true,"stopPropagation"=>true,"params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","jsCondition"=>NULL,"headers"=>null,"historize"=>false,"before"=>null)
 	 */
-	public function ajaxOnClick($element, $url, $responseElement = "", $parameters = array ()) {
-		return $this->ajaxOn ( "click", $element, $url, $responseElement, $parameters );
+	public function ajaxOnClick($element, $url, $responseElement="", $parameters=array()) {
+		return $this->ajaxOn("click", $element, $url, $responseElement, $parameters);
 	}
 
 	/**
@@ -559,8 +559,8 @@ 
 	 * @param array $parameters
 	 *        	default : array("preventDefault"=>true,"stopPropagation"=>true,"params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","jsCondition"=>NULL,"headers"=>null,"historize"=>false,"before"=>null)
 	 */
-	public function getOnClick($element, $url, $responseElement = "", $parameters = array ()) {
-		return $this->getOn ( "click", $element, $url, $responseElement, $parameters );
+	public function getOnClick($element, $url, $responseElement="", $parameters=array()) {
+		return $this->getOn("click", $element, $url, $responseElement, $parameters);
 	}
 
 	/**
@@ -574,17 +574,17 @@ 
 	 *        	default : array("preventDefault"=>true,"stopPropagation"=>true,"params"=>"{}","jsCallback"=>NULL,"attr"=>"href","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","jsCondition"=>NULL,"headers"=>null,"historize"=>true,"before"=>null)
 	 * @return $this
 	 */
-	public function getHref($element, $responseElement = "", $parameters = array ()) {
-		$parameters ["attr"] = "href";
-		if (JString::isNull ( $responseElement )) {
-			$responseElement = '%$(self).attr("data-target")%';
+	public function getHref($element, $responseElement="", $parameters=array()) {
+		$parameters ["attr"]="href";
+		if (JString::isNull($responseElement)) {
+			$responseElement='%$(self).attr("data-target")%';
 		} else {
-			$responseElement = '%$(self).attr("data-target") || "' . $responseElement . '"%';
+			$responseElement='%$(self).attr("data-target") || "'.$responseElement.'"%';
 		}
-		if (! isset ( $parameters ["historize"] )) {
-			$parameters ["historize"] = true;
+		if (!isset ($parameters ["historize"])) {
+			$parameters ["historize"]=true;
 		}
-		return $this->getOnClick ( $element, "", $responseElement, $parameters );
+		return $this->getOnClick($element, "", $responseElement, $parameters);
 	}
 
 	/**
@@ -598,21 +598,21 @@ 
 	 *        	default : array("preventDefault"=>true,"stopPropagation"=>true,"params"=>"{}","jsCallback"=>NULL,"attr"=>"href","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","jsCondition"=>NULL,"headers"=>null,"historize"=>true,"before"=>null)
 	 * @return $this
 	 */
-	public function postHref($element, $responseElement = "", $parameters = array ()) {
-		$parameters ["attr"] = "href";
-		if (JString::isNull ( $responseElement )) {
-			$responseElement = '%$(this).attr("data-target")%';
+	public function postHref($element, $responseElement="", $parameters=array()) {
+		$parameters ["attr"]="href";
+		if (JString::isNull($responseElement)) {
+			$responseElement='%$(this).attr("data-target")%';
 		} else {
-			$responseElement = '%$(self).attr("data-target") || "' . $responseElement . '"%';
+			$responseElement='%$(self).attr("data-target") || "'.$responseElement.'"%';
 		}
-		if (! isset ( $parameters ["historize"] )) {
-			$parameters ["historize"] = true;
+		if (!isset ($parameters ["historize"])) {
+			$parameters ["historize"]=true;
 		}
-		return $this->postOnClick ( $element, "", "{}", $responseElement, $parameters );
+		return $this->postOnClick($element, "", "{}", $responseElement, $parameters);
 	}
-	private function _post($url, $params = "{}", $responseElement = "", $parameters = [ ]) {
-		$parameters ["params"] = $params;
-		return $this->_ajax ( "POST", $url, $responseElement, $parameters );
+	private function _post($url, $params="{}", $responseElement="", $parameters=[]) {
+		$parameters ["params"]=$params;
+		return $this->_ajax("POST", $url, $responseElement, $parameters);
 	}
 
 	/**
@@ -627,9 +627,9 @@ 
 	 * @param array $parameters
 	 *        	default : array("jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null,"historize"=>false,"before"=>null)
 	 */
-	public function post($url, $params = "{}", $responseElement = "", $parameters = [ ]) {
-		$parameters ['immediatly'] = true;
-		return $this->_post ( $url, $params, $responseElement, $parameters );
+	public function post($url, $params="{}", $responseElement="", $parameters=[]) {
+		$parameters ['immediatly']=true;
+		return $this->_post($url, $params, $responseElement, $parameters);
 	}
 
 	/**
@@ -645,9 +645,9 @@ 
 	 * @param array $parameters
 	 *        	default : array("jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null,"historize"=>false,"before"=>null)
 	 */
-	public function postDeferred($url, $params = "{}", $responseElement = "", $parameters = [ ]) {
-		$parameters ["immediatly"] = false;
-		return $this->_post ( $url, $params, $responseElement, $parameters );
+	public function postDeferred($url, $params="{}", $responseElement="", $parameters=[]) {
+		$parameters ["immediatly"]=false;
+		return $this->_post($url, $params, $responseElement, $parameters);
 	}
 
 	/**
@@ -665,13 +665,13 @@ 
 	 * @param array $parameters
 	 *        	default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null,"historize"=>false,"before"=>null)
 	 */
-	public function postOn($event, $element, $url, $params = "{}", $responseElement = "", $parameters = array ()) {
-		$this->setDefaultParameters ( $parameters, [ 
+	public function postOn($event, $element, $url, $params="{}", $responseElement="", $parameters=array()) {
+		$this->setDefaultParameters($parameters, [ 
 				"preventDefault" => true,
 				"stopPropagation" => true,
 				"immediatly" => true
-		] );
-		return $this->_add_event ( $element, $this->postDeferred ( $url, $params, $responseElement, $parameters ), $event, $parameters ["preventDefault"], $parameters ["stopPropagation"], $parameters ["immediatly"] );
+		]);
+		return $this->_add_event($element, $this->postDeferred($url, $params, $responseElement, $parameters), $event, $parameters ["preventDefault"], $parameters ["stopPropagation"], $parameters ["immediatly"]);
 	}
 
 	/**
@@ -688,65 +688,65 @@ 
 	 * @param array $parameters
 	 *        	default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null,"historize"=>false,"before"=>null,"before"=>null)
 	 */
-	public function postOnClick($element, $url, $params = "{}", $responseElement = "", $parameters = array ()) {
-		return $this->postOn ( "click", $element, $url, $params, $responseElement, $parameters );
-	}
-	private function _postForm($url, $form, $responseElement, $parameters = [ ]) {
-		if (isset ( $this->params ["ajax"] )) {
-			extract ( $this->params ["ajax"] );
-		}
-		$params = "{}";
-		$validation = false;
-		\extract ( $parameters );
-		$async = ($async) ? "true" : "false";
-		$jsCallback = isset ( $jsCallback ) ? $jsCallback : "";
-		$retour = $this->_getAjaxUrl ( $url, $attr );
-		$retour .= "\n$('#" . $form . "').trigger('ajaxSubmit');";
-		if (! isset ( $contentType ) || $contentType != 'false') {
-			$retour .= "\nvar params=$('#" . $form . "').serialize();\n";
-			if (isset ( $params )) {
-				$retour .= "params+='&'+" . self::_correctParams ( $params ) . ";\n";
+	public function postOnClick($element, $url, $params="{}", $responseElement="", $parameters=array()) {
+		return $this->postOn("click", $element, $url, $params, $responseElement, $parameters);
+	}
+	private function _postForm($url, $form, $responseElement, $parameters=[]) {
+		if (isset ($this->params ["ajax"])) {
+			extract($this->params ["ajax"]);
+		}
+		$params="{}";
+		$validation=false;
+		\extract($parameters);
+		$async=($async) ? "true" : "false";
+		$jsCallback=isset ($jsCallback) ? $jsCallback : "";
+		$retour=$this->_getAjaxUrl($url, $attr);
+		$retour.="\n$('#".$form."').trigger('ajaxSubmit');";
+		if (!isset ($contentType) || $contentType!='false') {
+			$retour.="\nvar params=$('#".$form."').serialize();\n";
+			if (isset ($params)) {
+				$retour.="params+='&'+".self::_correctParams($params).";\n";
 			}
 		} else {
-			$retour .= "\nvar params=new FormData($('#" . $form . "')[0]);\n";
-		}
-		$responseElement = $this->_getResponseElement ( $responseElement );
-		$retour .= "var self=this;\n";
-		$before = isset ( $before ) ? $before : "";
-		$retour .= $before;
-		if ($hasLoader === true) {
-			$this->addLoading ( $retour, $responseElement, $ajaxLoader );
-		} elseif ($hasLoader === 'response') {
-			$this->addResponseLoading ( $retour, $responseElement, $ajaxLoader );
-		} elseif ($hasLoader === 'internal') {
-			$retour .= "\n$(this).addClass('loading');";
-		}
-		$ajaxParameters = [ 
+			$retour.="\nvar params=new FormData($('#".$form."')[0]);\n";
+		}
+		$responseElement=$this->_getResponseElement($responseElement);
+		$retour.="var self=this;\n";
+		$before=isset ($before) ? $before : "";
+		$retour.=$before;
+		if ($hasLoader===true) {
+			$this->addLoading($retour, $responseElement, $ajaxLoader);
+		} elseif ($hasLoader==='response') {
+			$this->addResponseLoading($retour, $responseElement, $ajaxLoader);
+		} elseif ($hasLoader==='internal') {
+			$retour.="\n$(this).addClass('loading');";
+		}
+		$ajaxParameters=[ 
 				"url" => "url",
 				"method" => "'POST'",
 				"data" => "params",
 				"async" => $async
 		];
-		if (isset ( $headers )) {
-			$ajaxParameters ["headers"] = $headers;
+		if (isset ($headers)) {
+			$ajaxParameters ["headers"]=$headers;
 		}
-		if (isset ( $partial )) {
-			$ajaxParameters ["xhr"] = "xhrProvider";
-			$retour .= "var xhr = $.ajaxSettings.xhr();function xhrProvider() {return xhr;};xhr.onreadystatechange = function (e) { if (3==e.target.readyState){let response=e.target.responseText;" . $partial . ";}; };";
+		if (isset ($partial)) {
+			$ajaxParameters ["xhr"]="xhrProvider";
+			$retour.="var xhr = $.ajaxSettings.xhr();function xhrProvider() {return xhr;};xhr.onreadystatechange = function (e) { if (3==e.target.readyState){let response=e.target.responseText;".$partial.";}; };";
 		}
-		$this->createAjaxParameters ( $ajaxParameters, $parameters );
-		$retour .= "$.ajax({" . $this->implodeAjaxParameters ( $ajaxParameters ) . "}).done(function( data ) {\n";
-		$retour .= $this->_getOnAjaxDone ( $responseElement, $jqueryDone, $ajaxTransition, $jsCallback, $hasLoader ) . "});\n";
+		$this->createAjaxParameters($ajaxParameters, $parameters);
+		$retour.="$.ajax({".$this->implodeAjaxParameters($ajaxParameters)."}).done(function( data ) {\n";
+		$retour.=$this->_getOnAjaxDone($responseElement, $jqueryDone, $ajaxTransition, $jsCallback, $hasLoader)."});\n";
 
 		if ($validation) {
-			$retour = "$('#" . $form . "').validate({submitHandler: function(form) {
-			" . $retour . "
+			$retour="$('#".$form."').validate({submitHandler: function(form) {
+			" . $retour."
 			}});\n";
-			$retour .= "$('#" . $form . "').submit();\n";
+			$retour.="$('#".$form."').submit();\n";
 		}
-		$retour = $this->_addJsCondition ( $jsCondition, $retour );
+		$retour=$this->_addJsCondition($jsCondition, $retour);
 		if ($immediatly)
-			$this->jquery_code_for_compile [] = $retour;
+			$this->jquery_code_for_compile []=$retour;
 		return $retour;
 	}
 
@@ -762,9 +762,9 @@ 
 	 * @param array $parameters
 	 *        	default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null,"historize"=>false,"before"=>null)
 	 */
-	public function postForm($url, $form, $responseElement, $parameters = [ ]) {
-		$parameters ["immediatly"] = true;
-		return $this->_postForm ( $url, $form, $responseElement, $parameters );
+	public function postForm($url, $form, $responseElement, $parameters=[]) {
+		$parameters ["immediatly"]=true;
+		return $this->_postForm($url, $form, $responseElement, $parameters);
 	}
 
 	/**
@@ -780,9 +780,9 @@ 
 	 * @param array $parameters
 	 *        	default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null,"historize"=>false,"before"=>null)
 	 */
-	public function postFormDeferred($url, $form, $responseElement, $parameters = [ ]) {
-		$parameters ["immediatly"] = false;
-		return $this->_postForm ( $url, $form, $responseElement, $parameters );
+	public function postFormDeferred($url, $form, $responseElement, $parameters=[]) {
+		$parameters ["immediatly"]=false;
+		return $this->_postForm($url, $form, $responseElement, $parameters);
 	}
 
 	/**
@@ -798,13 +798,13 @@ 
 	 * @param array $parameters
 	 *        	default : array("preventDefault"=>true,"stopPropagation"=>true,"validation"=>false,"params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>null,"headers"=>null,"historize"=>false,"before"=>null)
 	 */
-	public function postFormOn($event, $element, $url, $form, $responseElement = "", $parameters = array ()) {
-		$this->setDefaultParameters ( $parameters, [ 
+	public function postFormOn($event, $element, $url, $form, $responseElement="", $parameters=array()) {
+		$this->setDefaultParameters($parameters, [ 
 				"preventDefault" => true,
 				"stopPropagation" => true,
 				"immediatly" => true
-		] );
-		return $this->_add_event ( $element, $this->postFormDeferred ( $url, $form, $responseElement, $parameters ), $event, $parameters ["preventDefault"], $parameters ["stopPropagation"], $parameters ["immediatly"] );
+		]);
+		return $this->_add_event($element, $this->postFormDeferred($url, $form, $responseElement, $parameters), $event, $parameters ["preventDefault"], $parameters ["stopPropagation"], $parameters ["immediatly"]);
 	}
 
 	/**
@@ -819,7 +819,7 @@ 
 	 * @param array $parameters
 	 *        	default : array("preventDefault"=>true,"stopPropagation"=>true,"validation"=>false,"params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>null,"headers"=>null,"historize"=>false,"before"=>null)
 	 */
-	public function postFormOnClick($element, $url, $form, $responseElement = "", $parameters = array ()) {
-		return $this->postFormOn ( "click", $element, $url, $form, $responseElement, $parameters );
+	public function postFormOnClick($element, $url, $form, $responseElement="", $parameters=array()) {
+		return $this->postFormOn("click", $element, $url, $form, $responseElement, $parameters);
 	}
 }

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

Spacing +180 added lines, -180 removed lines

@@ -11,7 +11,7 @@ 
  * @property array $jquery_code_for_compile_at_last
  */
 trait JsUtilsActionsTrait {
-	abstract public function _add_event($element, $js, $event, $preventDefault = false, $stopPropagation = false, $immediatly = true);
+	abstract public function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false, $immediatly=true);
 
 	/**
 	 * show or hide with effect
@@ -27,15 +27,15 @@ 
 	 *        	defers the execution if set to false
 	 * @return string
 	 */
-	protected function _showHideWithEffect($action, $element = 'this', $speed = '', $callback = '', $immediatly = false) {
-		$element = Javascript::prep_element ( $element );
-		$speed = $this->_validate_speed ( $speed );
-		if ($callback != '') {
-			$callback = ", function(){\n{$callback}\n}";
+	protected function _showHideWithEffect($action, $element='this', $speed='', $callback='', $immediatly=false) {
+		$element=Javascript::prep_element($element);
+		$speed=$this->_validate_speed($speed);
+		if ($callback!='') {
+			$callback=", function(){\n{$callback}\n}";
 		}
-		$str = "$({$element}).{$action}({$speed}{$callback});";
+		$str="$({$element}).{$action}({$speed}{$callback});";
 		if ($immediatly)
-			$this->jquery_code_for_compile [] = $str;
+			$this->jquery_code_for_compile []=$str;
 		return $str;
 	}
 
@@ -46,14 +46,14 @@ 
 	 * @return string
 	 */
 	private function _validate_speed($speed) {
-		if (in_array ( $speed, array (
+		if (in_array($speed, array(
 				'slow',
 				'normal',
 				'fast'
-		) )) {
-			$speed = '"' . $speed . '"';
-		} elseif (preg_match ( "/[^0-9]/", $speed )) {
-			$speed = '';
+		))) {
+			$speed='"'.$speed.'"';
+		} elseif (preg_match("/[^0-9]/", $speed)) {
+			$speed='';
 		}
 
 		return $speed;
@@ -68,15 +68,15 @@ 
 	 * @param boolean $immediatly
 	 *        	delayed if false
 	 */
-	public function _genericCallValue($jQueryCall, $element = 'this', $param = "", $immediatly = false) {
-		$element = Javascript::prep_element ( $element );
-		if (isset ( $param )) {
-			$param = Javascript::prep_value ( $param );
-			$str = "$({$element}).{$jQueryCall}({$param});";
+	public function _genericCallValue($jQueryCall, $element='this', $param="", $immediatly=false) {
+		$element=Javascript::prep_element($element);
+		if (isset ($param)) {
+			$param=Javascript::prep_value($param);
+			$str="$({$element}).{$jQueryCall}({$param});";
 		} else
-			$str = "$({$element}).{$jQueryCall}();";
+			$str="$({$element}).{$jQueryCall}();";
 		if ($immediatly)
-			$this->jquery_code_for_compile [] = $str;
+			$this->jquery_code_for_compile []=$str;
 		return $str;
 	}
 
@@ -90,12 +90,12 @@ 
 	 *        	delayed if false
 	 * @return string
 	 */
-	public function _genericCallElement($jQueryCall, $to = 'this', $element = '', $immediatly = false) {
-		$to = Javascript::prep_element ( $to );
-		$element = Javascript::prep_element ( $element );
-		$str = "$({$to}).{$jQueryCall}({$element});";
+	public function _genericCallElement($jQueryCall, $to='this', $element='', $immediatly=false) {
+		$to=Javascript::prep_element($to);
+		$element=Javascript::prep_element($element);
+		$str="$({$to}).{$jQueryCall}({$element});";
 		if ($immediatly)
-			$this->jquery_code_for_compile [] = $str;
+			$this->jquery_code_for_compile []=$str;
 		return $str;
 	}
 
@@ -109,8 +109,8 @@ 
 	 *        	defers the execution if set to false
 	 * @return string
 	 */
-	public function addClass($element = 'this', $class = '', $immediatly = false) {
-		return $this->_genericCallValue ( 'addClass', $element, $class, $immediatly );
+	public function addClass($element='this', $class='', $immediatly=false) {
+		return $this->_genericCallValue('addClass', $element, $class, $immediatly);
 	}
 
 	/**
@@ -122,8 +122,8 @@ 
 	 *        	defers the execution if set to false
 	 * @return string
 	 */
-	public function after($to, $element, $immediatly = false) {
-		return $this->_genericCallElement ( 'after', $to, $element, $immediatly );
+	public function after($to, $element, $immediatly=false) {
+		return $this->_genericCallElement('after', $to, $element, $immediatly);
 	}
 
 	/**
@@ -135,8 +135,8 @@ 
 	 *        	defers the execution if set to false
 	 * @return string
 	 */
-	public function before($to, $element, $immediatly = false) {
-		return $this->_genericCallElement ( 'before', $to, $element, $immediatly );
+	public function before($to, $element, $immediatly=false) {
+		return $this->_genericCallElement('before', $to, $element, $immediatly);
 	}
 
 	/**
@@ -148,15 +148,15 @@ 
 	 * @param boolean $immediatly
 	 *        	delayed if false
 	 */
-	public function attr($element = 'this', $attributeName = 'id', $value = "", $immediatly = false) {
-		$element = Javascript::prep_element ( $element );
-		if (isset ( $value )) {
-			$value = Javascript::prep_value ( $value );
-			$str = "$({$element}).attr(\"$attributeName\",{$value});";
+	public function attr($element='this', $attributeName='id', $value="", $immediatly=false) {
+		$element=Javascript::prep_element($element);
+		if (isset ($value)) {
+			$value=Javascript::prep_value($value);
+			$str="$({$element}).attr(\"$attributeName\",{$value});";
 		} else
-			$str = "$({$element}).attr(\"$attributeName\");";
+			$str="$({$element}).attr(\"$attributeName\");";
 		if ($immediatly)
-			$this->jquery_code_for_compile [] = $str;
+			$this->jquery_code_for_compile []=$str;
 		return $str;
 	}
 
@@ -168,8 +168,8 @@ 
 	 * @param boolean $immediatly
 	 *        	defers the execution if set to false
 	 */
-	public function val($element = 'this', $value = '', $immediatly = false) {
-		return $this->_genericCallValue ( 'val', $element, $value, $immediatly );
+	public function val($element='this', $value='', $immediatly=false) {
+		return $this->_genericCallValue('val', $element, $value, $immediatly);
 	}
 
 	/**
@@ -180,8 +180,8 @@ 
 	 * @param boolean $immediatly
 	 *        	defers the execution if set to false
 	 */
-	public function html($element = 'this', $value = '', $immediatly = false) {
-		return $this->_genericCallValue ( 'html', $element, $value, $immediatly );
+	public function html($element='this', $value='', $immediatly=false) {
+		return $this->_genericCallValue('html', $element, $value, $immediatly);
 	}
 
 	/**
@@ -197,30 +197,30 @@ 
 	 *        	defers the execution if set to false
 	 * @return string
 	 */
-	public function animate($element = 'this', $params = array (), $speed = '', $extra = '', $immediatly = false) {
-		$element = Javascript::prep_element ( $element );
-		$speed = $this->_validate_speed ( $speed );
+	public function animate($element='this', $params=array(), $speed='', $extra='', $immediatly=false) {
+		$element=Javascript::prep_element($element);
+		$speed=$this->_validate_speed($speed);
 
-		$animations = "\t\t\t";
-		if (\is_array ( $params )) {
-			foreach ( $params as $param => $value ) {
-				$animations .= $param . ': \'' . $value . '\', ';
+		$animations="\t\t\t";
+		if (\is_array($params)) {
+			foreach ($params as $param => $value) {
+				$animations.=$param.': \''.$value.'\', ';
 			}
 		}
-		$animations = substr ( $animations, 0, - 2 ); // remove the last ", "
+		$animations=substr($animations, 0, - 2); // remove the last ", "
 
-		if ($speed != '') {
-			$speed = ', ' . $speed;
+		if ($speed!='') {
+			$speed=', '.$speed;
 		}
 
-		if ($extra != '') {
-			$extra = ', ' . $extra;
+		if ($extra!='') {
+			$extra=', '.$extra;
 		}
 
-		$str = "$({$element}).animate({\n$animations\n\t\t}" . $speed . $extra . ");";
+		$str="$({$element}).animate({\n$animations\n\t\t}".$speed.$extra.");";
 
 		if ($immediatly)
-			$this->jquery_code_for_compile [] = $str;
+			$this->jquery_code_for_compile []=$str;
 		return $str;
 	}
 
@@ -233,8 +233,8 @@ 
 	 *        	defers the execution if set to false
 	 * @return string
 	 */
-	public function append($to, $element, $immediatly = false) {
-		return $this->_genericCallElement ( 'append', $to, $element, $immediatly );
+	public function append($to, $element, $immediatly=false) {
+		return $this->_genericCallElement('append', $to, $element, $immediatly);
 	}
 
 	/**
@@ -246,8 +246,8 @@ 
 	 *        	defers the execution if set to false
 	 * @return string
 	 */
-	public function prepend($to, $element, $immediatly = false) {
-		return $this->_genericCallElement ( 'prepend', $to, $element, $immediatly );
+	public function prepend($to, $element, $immediatly=false) {
+		return $this->_genericCallElement('prepend', $to, $element, $immediatly);
 	}
 
 	/**
@@ -263,8 +263,8 @@ 
 	 *        	defers the execution if set to false
 	 * @return string
 	 */
-	public function fadeIn($element = 'this', $speed = '', $callback = '', $immediatly = false) {
-		return $this->_showHideWithEffect ( "fadeIn", $element, $speed, $callback, $immediatly );
+	public function fadeIn($element='this', $speed='', $callback='', $immediatly=false) {
+		return $this->_showHideWithEffect("fadeIn", $element, $speed, $callback, $immediatly);
 	}
 
 	/**
@@ -280,8 +280,8 @@ 
 	 *        	defers the execution if set to false
 	 * @return string
 	 */
-	public function fadeOut($element = 'this', $speed = '', $callback = '', $immediatly = false) {
-		return $this->_showHideWithEffect ( "fadeOut", $element, $speed, $callback, $immediatly );
+	public function fadeOut($element='this', $speed='', $callback='', $immediatly=false) {
+		return $this->_showHideWithEffect("fadeOut", $element, $speed, $callback, $immediatly);
 	}
 
 	/**
@@ -297,8 +297,8 @@ 
 	 *        	defers the execution if set to false
 	 * @return string
 	 */
-	public function slideUp($element = 'this', $speed = '', $callback = '', $immediatly = false) {
-		return $this->_showHideWithEffect ( "slideUp", $element, $speed, $callback, $immediatly );
+	public function slideUp($element='this', $speed='', $callback='', $immediatly=false) {
+		return $this->_showHideWithEffect("slideUp", $element, $speed, $callback, $immediatly);
 	}
 
 	/**
@@ -312,8 +312,8 @@ 
 	 *        	defers the execution if set to false
 	 * @return string
 	 */
-	public function removeClass($element = 'this', $class = '', $immediatly = false) {
-		return $this->_genericCallValue ( 'removeClass', $element, $class, $immediatly );
+	public function removeClass($element='this', $class='', $immediatly=false) {
+		return $this->_genericCallValue('removeClass', $element, $class, $immediatly);
 	}
 
 	/**
@@ -329,8 +329,8 @@ 
 	 *        	defers the execution if set to false
 	 * @return string
 	 */
-	public function slideDown($element = 'this', $speed = '', $callback = '', $immediatly = false) {
-		return $this->_showHideWithEffect ( "slideDown", $element, $speed, $callback, $immediatly );
+	public function slideDown($element='this', $speed='', $callback='', $immediatly=false) {
+		return $this->_showHideWithEffect("slideDown", $element, $speed, $callback, $immediatly);
 	}
 
 	/**
@@ -346,8 +346,8 @@ 
 	 *        	defers the execution if set to false
 	 * @return string
 	 */
-	public function slideToggle($element = 'this', $speed = '', $callback = '', $immediatly = false) {
-		return $this->_showHideWithEffect ( "slideToggle", $element, $speed, $callback, $immediatly );
+	public function slideToggle($element='this', $speed='', $callback='', $immediatly=false) {
+		return $this->_showHideWithEffect("slideToggle", $element, $speed, $callback, $immediatly);
 	}
 
 	/**
@@ -363,8 +363,8 @@ 
 	 *        	defers the execution if set to false
 	 * @return string
 	 */
-	public function hide($element = 'this', $speed = '', $callback = '', $immediatly = false) {
-		return $this->_showHideWithEffect ( "hide", $element, $speed, $callback, $immediatly );
+	public function hide($element='this', $speed='', $callback='', $immediatly=false) {
+		return $this->_showHideWithEffect("hide", $element, $speed, $callback, $immediatly);
 	}
 
 	/**
@@ -380,8 +380,8 @@ 
 	 *        	defers the execution if set to false
 	 * @return string
 	 */
-	public function toggle($element = 'this', $speed = '', $callback = '', $immediatly = false) {
-		return $this->_showHideWithEffect ( "toggle", $element, $speed, $callback, $immediatly );
+	public function toggle($element='this', $speed='', $callback='', $immediatly=false) {
+		return $this->_showHideWithEffect("toggle", $element, $speed, $callback, $immediatly);
 	}
 
 	/**
@@ -394,8 +394,8 @@ 
 	 *        	defers the execution if set to false
 	 * @return string
 	 */
-	public function toggleClass($element = 'this', $class = '', $immediatly = false) {
-		return $this->_genericCallValue ( 'toggleClass', $element, $class, $immediatly );
+	public function toggleClass($element='this', $class='', $immediatly=false) {
+		return $this->_genericCallValue('toggleClass', $element, $class, $immediatly);
 	}
 
 	/**
@@ -406,12 +406,12 @@ 
 	 * @param boolean $immediatly
 	 *        	defers the execution if set to false
 	 */
-	public function trigger($element = 'this', $event = 'click', $immediatly = false) {
-		$element = Javascript::prep_element ( $element );
-		$str = "$({$element}).trigger(\"$event\");";
+	public function trigger($element='this', $event='click', $immediatly=false) {
+		$element=Javascript::prep_element($element);
+		$str="$({$element}).trigger(\"$event\");";
 
 		if ($immediatly)
-			$this->jquery_code_for_compile [] = $str;
+			$this->jquery_code_for_compile []=$str;
 		return $str;
 	}
 
@@ -428,8 +428,8 @@ 
 	 *        	defers the execution if set to false
 	 * @return string
 	 */
-	public function show($element = 'this', $speed = '', $callback = '', $immediatly = false) {
-		return $this->_showHideWithEffect ( "show", $element, $speed, $callback, $immediatly );
+	public function show($element='this', $speed='', $callback='', $immediatly=false) {
+		return $this->_showHideWithEffect("show", $element, $speed, $callback, $immediatly);
 	}
 
 	/**
@@ -439,18 +439,18 @@ 
 	 * @param array $options
 	 * @return string
 	 */
-	public function sortable($element, $options = array ()) {
-		if (count ( $options ) > 0) {
-			$sort_options = array ();
-			foreach ( $options as $k => $v ) {
-				$sort_options [] = "\n\t\t" . $k . ': ' . $v . "";
+	public function sortable($element, $options=array()) {
+		if (count($options)>0) {
+			$sort_options=array();
+			foreach ($options as $k => $v) {
+				$sort_options []="\n\t\t".$k.': '.$v."";
 			}
-			$sort_options = implode ( ",", $sort_options );
+			$sort_options=implode(",", $sort_options);
 		} else {
-			$sort_options = '';
+			$sort_options='';
 		}
 
-		return "$(" . Javascript::prep_element ( $element ) . ").sortable({" . $sort_options . "\n\t});";
+		return "$(".Javascript::prep_element($element).").sortable({".$sort_options."\n\t});";
 	}
 
 	/**
@@ -462,8 +462,8 @@ 
 	 *        	plugin location
 	 * @return string
 	 */
-	public function tablesorter($table = '', $options = '') {
-		$this->jquery_code_for_compile [] = "\t$(" . Javascript::prep_element ( $table ) . ").tablesorter($options);\n";
+	public function tablesorter($table='', $options='') {
+		$this->jquery_code_for_compile []="\t$(".Javascript::prep_element($table).").tablesorter($options);\n";
 	}
 
 	/**
@@ -475,14 +475,14 @@ 
 	 * @param boolean $immediatly
 	 *        	defers the execution if set to false
 	 */
-	public function condition($condition, $jsCodeIfTrue, $jsCodeIfFalse = null, $immediatly = false) {
-		$str = "if(" . $condition . "){" . $jsCodeIfTrue . "}";
-		if (isset ( $jsCodeIfFalse )) {
-			$str .= "else{" . $jsCodeIfFalse . "}";
+	public function condition($condition, $jsCodeIfTrue, $jsCodeIfFalse=null, $immediatly=false) {
+		$str="if(".$condition."){".$jsCodeIfTrue."}";
+		if (isset ($jsCodeIfFalse)) {
+			$str.="else{".$jsCodeIfFalse."}";
 		}
 
 		if ($immediatly)
-			$this->jquery_code_for_compile [] = $str;
+			$this->jquery_code_for_compile []=$str;
 		return $str;
 	}
 
@@ -497,14 +497,14 @@ 
 	 * @param boolean $immediatly
 	 * @return string
 	 */
-	private function _doJQuery($element, $jqueryCall, $param = "", $jsCallback = "", $immediatly = false) {
-		$param = Javascript::prep_value ( $param );
-		$callback = "";
-		if ($jsCallback != "")
-			$callback = ", function(event){\n{$jsCallback}\n}";
-		$script = "$(" . Javascript::prep_element ( $element ) . ")." . $jqueryCall . "(" . $param . $callback . ");\n";
+	private function _doJQuery($element, $jqueryCall, $param="", $jsCallback="", $immediatly=false) {
+		$param=Javascript::prep_value($param);
+		$callback="";
+		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;
+			$this->jquery_code_for_compile []=$script;
 		return $script;
 	}
 
@@ -521,8 +521,8 @@ 
 	 *        	javascript code to execute after the jquery call
 	 * @return mixed
 	 */
-	public function doJQuery($element, $jqueryCall, $param = "", $jsCallback = "") {
-		return $this->_doJQuery ( $element, $jqueryCall, $param, $jsCallback, true );
+	public function doJQuery($element, $jqueryCall, $param="", $jsCallback="") {
+		return $this->_doJQuery($element, $jqueryCall, $param, $jsCallback, true);
 	}
 
 	/**
@@ -538,8 +538,8 @@ 
 	 *        	javascript code to execute after the jquery call
 	 * @return mixed
 	 */
-	public function doJQueryDeferred($element, $jqueryCall, $param = "", $jsCallback = "") {
-		return $this->_doJQuery ( $element, $jqueryCall, $param, $jsCallback, false );
+	public function doJQueryDeferred($element, $jqueryCall, $param="", $jsCallback="") {
+		return $this->_doJQuery($element, $jqueryCall, $param, $jsCallback, false);
 	}
 
 	/**
@@ -556,8 +556,8 @@ 
 	 * @param boolean $immediatly
 	 * @return string
 	 */
-	private function _doJQueryOn($event, $element, $elementToModify, $jqueryCall, $param = "", $preventDefault = false, $stopPropagation = false, $jsCallback = "", $immediatly = true) {
-		return $this->_add_event ( $element, $this->_doJQuery ( $elementToModify, $jqueryCall, $param, $jsCallback ), $event, $preventDefault, $stopPropagation, $immediatly );
+	private function _doJQueryOn($event, $element, $elementToModify, $jqueryCall, $param="", $preventDefault=false, $stopPropagation=false, $jsCallback="", $immediatly=true) {
+		return $this->_add_event($element, $this->_doJQuery($elementToModify, $jqueryCall, $param, $jsCallback), $event, $preventDefault, $stopPropagation, $immediatly);
 	}
 
 	/**
@@ -571,13 +571,13 @@ 
 	 * @param array $parameters
 	 *        	default : array("preventDefault"=>false,"stopPropagation"=>false,"jsCallback"=>'',"immediatly"=>true)
 	 */
-	public function doJQueryOn($event, $element, $elementToModify, $jqueryCall, $param = "", $parameters = array ()) {
-		$jsCallback = "";
-		$stopPropagation = false;
-		$preventDefault = false;
-		$immediatly = true;
-		extract ( $parameters );
-		return $this->_doJQueryOn ( $event, $element, $elementToModify, $jqueryCall, $param, $preventDefault, $stopPropagation, $jsCallback, $immediatly );
+	public function doJQueryOn($event, $element, $elementToModify, $jqueryCall, $param="", $parameters=array()) {
+		$jsCallback="";
+		$stopPropagation=false;
+		$preventDefault=false;
+		$immediatly=true;
+		extract($parameters);
+		return $this->_doJQueryOn($event, $element, $elementToModify, $jqueryCall, $param, $preventDefault, $stopPropagation, $jsCallback, $immediatly);
 	}
 
 	/**
@@ -589,10 +589,10 @@ 
 	 *        	delayed if false
 	 * @return String
 	 */
-	public function exec($js, $immediatly = false) {
-		$script = $js . "\n";
+	public function exec($js, $immediatly=false) {
+		$script=$js."\n";
 		if ($immediatly)
-			$this->jquery_code_for_compile [] = $script;
+			$this->jquery_code_for_compile []=$script;
 		return $script;
 	}
 
@@ -606,8 +606,8 @@ 
 	 * @return String
 	 */
 	public function execAtLast($js) {
-		$script = $js . "\n";
-		$this->jquery_code_for_compile_at_last [] = $script;
+		$script=$js."\n";
+		$this->jquery_code_for_compile_at_last []=$script;
 		return $script;
 	}
 
@@ -622,18 +622,18 @@ 
 	 *        	default : array("preventDefault"=>false,"stopPropagation"=>false,"immediatly"=>true)
 	 * @return String
 	 */
-	public function execOn($event, $element, $js, $parameters = array ()) {
-		$stopPropagation = false;
-		$preventDefault = false;
-		$immediatly = true;
-		extract ( $parameters );
-		$script = $this->_add_event ( $element, $this->exec ( $js ), $event, $preventDefault, $stopPropagation, $immediatly );
+	public function execOn($event, $element, $js, $parameters=array()) {
+		$stopPropagation=false;
+		$preventDefault=false;
+		$immediatly=true;
+		extract($parameters);
+		$script=$this->_add_event($element, $this->exec($js), $event, $preventDefault, $stopPropagation, $immediatly);
 		return $script;
 	}
-	public function setJsonToElement($json, $elementClass = "_element", $immediatly = true) {
-		$retour = "var data={$json};" . "\n\tdata=($.isPlainObject(data))?data:JSON.parse(data);" . "\n\tvar pk=data['pk'];var object=data['object'];" . "\n\tfor(var field in object){" . "\n\tif($('[data-field='+field+']',$('._element[data-ajax='+pk+']')).length){" . "\n\t\t$('[data-field='+field+']',$('._element[data-ajax='+pk+']')).each(function(){" . "\n\t\t\tif($(this).is('[value]')) { $(this).val(object[field]);} else { $(this).html(object[field]); }" . "\n\t});" . "\n}};\n";
-		$retour .= "\t$(document).trigger('jsonReady',[data]);\n";
-		return $this->exec ( $retour, $immediatly );
+	public function setJsonToElement($json, $elementClass="_element", $immediatly=true) {
+		$retour="var data={$json};"."\n\tdata=($.isPlainObject(data))?data:JSON.parse(data);"."\n\tvar pk=data['pk'];var object=data['object'];"."\n\tfor(var field in object){"."\n\tif($('[data-field='+field+']',$('._element[data-ajax='+pk+']')).length){"."\n\t\t$('[data-field='+field+']',$('._element[data-ajax='+pk+']')).each(function(){"."\n\t\t\tif($(this).is('[value]')) { $(this).val(object[field]);} else { $(this).html(object[field]); }"."\n\t});"."\n}};\n";
+		$retour.="\t$(document).trigger('jsonReady',[data]);\n";
+		return $this->exec($retour, $immediatly);
 	}
 
 	/**
@@ -644,13 +644,13 @@ 
 	 * @param array $parameters
 	 *        	default : array("attr"=>"id","preventDefault"=>false,"stopPropagation"=>false,"immediatly"=>true)
 	 */
-	public function setDraggable($element, $parameters = [ ]) {
-		$attr = "id";
-		$preventDefault = false;
-		$stopPropagation = false;
-		$immediatly = true;
-		extract ( $parameters );
-		$script = $this->_add_event ( $element, Javascript::draggable ( $attr ), "dragstart", $preventDefault, $stopPropagation, $immediatly );
+	public function setDraggable($element, $parameters=[]) {
+		$attr="id";
+		$preventDefault=false;
+		$stopPropagation=false;
+		$immediatly=true;
+		extract($parameters);
+		$script=$this->_add_event($element, Javascript::draggable($attr), "dragstart", $preventDefault, $stopPropagation, $immediatly);
 		return $script;
 	}
 
@@ -664,13 +664,13 @@ 
 	 * @param string $jsCallback
 	 *        	the js script to call when element is dropped
 	 */
-	public function asDropZone($element, $jsCallback = "", $parameters = [ ]) {
-		$stopPropagation = false;
-		$immediatly = true;
-		$jqueryDone = "append";
-		$script = $this->_add_event ( $element, '', "dragover", true, $stopPropagation, $immediatly );
-		extract ( $parameters );
-		$script .= $this->_add_event ( $element, Javascript::dropZone ( $jqueryDone, $jsCallback ), "drop", true, $stopPropagation, $immediatly );
+	public function asDropZone($element, $jsCallback="", $parameters=[]) {
+		$stopPropagation=false;
+		$immediatly=true;
+		$jqueryDone="append";
+		$script=$this->_add_event($element, '', "dragover", true, $stopPropagation, $immediatly);
+		extract($parameters);
+		$script.=$this->_add_event($element, Javascript::dropZone($jqueryDone, $jsCallback), "drop", true, $stopPropagation, $immediatly);
 		return $script;
 	}
 
@@ -687,16 +687,16 @@ 
 	 *        	delayed if false
 	 * @return string
 	 */
-	public function interval($jsCode, $time, $globalName = null, $immediatly = true) {
-		if (! Javascript::isFunction ( $jsCode )) {
-			$jsCode = "function(){\n" . $jsCode . "\n}";
+	public function interval($jsCode, $time, $globalName=null, $immediatly=true) {
+		if (!Javascript::isFunction($jsCode)) {
+			$jsCode="function(){\n".$jsCode."\n}";
 		}
-		if (isset ( $globalName )) {
-			$script = "if(window.{$globalName}){clearInterval(window.{$globalName});}\nwindow.{$globalName}=setInterval({$jsCode},{$time});";
+		if (isset ($globalName)) {
+			$script="if(window.{$globalName}){clearInterval(window.{$globalName});}\nwindow.{$globalName}=setInterval({$jsCode},{$time});";
 		} else {
-			$script = "setInterval({$jsCode},{$time});";
+			$script="setInterval({$jsCode},{$time});";
 		}
-		return $this->exec ( $script, $immediatly );
+		return $this->exec($script, $immediatly);
 	}
 
 	/**
@@ -708,8 +708,8 @@ 
 	 *        	delayed if false
 	 * @return string
 	 */
-	public function clearInterval($globalName, $immediatly = true) {
-		return $this->exec ( "if(window.{$globalName}){clearInterval(window.{$globalName});}", $immediatly );
+	public function clearInterval($globalName, $immediatly=true) {
+		return $this->exec("if(window.{$globalName}){clearInterval(window.{$globalName});}", $immediatly);
 	}
 
 	/**
@@ -730,20 +730,20 @@ 
 	 *        	delayed if false
 	 * @return string
 	 */
-	public function counter($counterSelector, $value = 0, $limit = 0, $globalName = null, $countDown = true, $immediatly = true) {
-		$stop = "";
+	public function counter($counterSelector, $value=0, $limit=0, $globalName=null, $countDown=true, $immediatly=true) {
+		$stop="";
 		if ($countDown) {
-			$stop = "if (--timer < " . $limit . ") {clearInterval(interval);display.trigger({type:'counter-end',value: timer,limit:" . $limit . "});}";
+			$stop="if (--timer < ".$limit.") {clearInterval(interval);display.trigger({type:'counter-end',value: timer,limit:".$limit."});}";
 		} else {
-			if ($limit != 0) {
-				$stop = "if (++timer > " . $limit . ") {clearInterval(interval);display.trigger({type:'counter-end',value: timer,limit:" . $limit . "});}";
+			if ($limit!=0) {
+				$stop="if (++timer > ".$limit.") {clearInterval(interval);display.trigger({type:'counter-end',value: timer,limit:".$limit."});}";
 			}
 		}
-		$global = "";
-		if (isset ( $globalName )) {
-			$global = "\nwindow.{$globalName}=interval;";
+		$global="";
+		if (isset ($globalName)) {
+			$global="\nwindow.{$globalName}=interval;";
 		}
-		$timer = "var startTimer=function(duration, display) {var timer = duration, days, hours, minutes, seconds;
+		$timer="var startTimer=function(duration, display) {var timer = duration, days, hours, minutes, seconds;
 											var sh=function(disp,v){if(disp.is('[value]')){disp.val(v);} else {disp.html(v);};};
 											var shHide=function(v,k,kBefore){if(v==0 && display.find(k).closest('.timer').is(':visible') && (!kBefore || !display.find(kBefore).closest('.timer').is(':visible'))){display.find(k).closest('.timer').hide();}else{sh(display.find(k),v);}};
 											var pl=function(v,text){return (v>1)?v+' '+text+'s':(v>0)?v+' '+text:'';};
@@ -759,12 +759,12 @@ 
 												minutes = d0(parseInt((timer%3600) / 60, 10));
 												seconds = d0(parseInt(timer%60, 10));
 												mainSh(days,hours,minutes,seconds);
-												" . $stop . "
+												" . $stop."
     										}, 1000);
-										" . $global . "
+										" . $global."
 										}";
-		$element = '$("' . $counterSelector . '")';
-		return $this->exec ( $timer . "\nstartTimer(" . $value . "," . $element . ");", $immediatly );
+		$element='$("'.$counterSelector.'")';
+		return $this->exec($timer."\nstartTimer(".$value.",".$element.");", $immediatly);
 	}
 
 	/**
@@ -786,8 +786,8 @@ 
 	 *        	count down if true or elapse if false
 	 * @return string
 	 */
-	public function counterOn($element, $event, $counterSelector, $value = 0, $limit = 0, $globalName = null, $countDown = true) {
-		return $this->execOn ( $event, $element, $this->counter ( $counterSelector, $value, $limit, $globalName, $countDown, false ) );
+	public function counterOn($element, $event, $counterSelector, $value=0, $limit=0, $globalName=null, $countDown=true) {
+		return $this->execOn($event, $element, $this->counter($counterSelector, $value, $limit, $globalName, $countDown, false));
 	}
 
 	/**
@@ -801,8 +801,8 @@ 
 	 *        	the active href (if null, window.location.href is used)
 	 * @return string
 	 */
-	public function activateLink($target, $property = 'href', $href = null) {
-		return $this->execAtLast ( $this->_activateLink ( $target, $property, $href ) );
+	public function activateLink($target, $property='href', $href=null) {
+		return $this->execAtLast($this->_activateLink($target, $property, $href));
 	}
 
 	/**
@@ -816,14 +816,14 @@ 
 	 *        	the active href (if null, window.location.href is used)
 	 * @return string
 	 */
-	public function _activateLink($target, $property = 'href', $href = null) {
-		$js = '$("' . $target . ' [' . $property . ']").removeClass("active");';
-		if (isset ( $href )) {
-			$js .= 'var href="' . $href . '";';
+	public function _activateLink($target, $property='href', $href=null) {
+		$js='$("'.$target.' ['.$property.']").removeClass("active");';
+		if (isset ($href)) {
+			$js.='var href="'.$href.'";';
 		} else {
-			$js .= 'var href=window.location.href;';
+			$js.='var href=window.location.href;';
 		}
-		$js .= '$("' . $target . ' [' . $property . ']").each(function(){if(href.includes($(this).attr("' . $property . '"))) $(this).addClass("active");});';
+		$js.='$("'.$target.' ['.$property.']").each(function(){if(href.includes($(this).attr("'.$property.'"))) $(this).addClass("active");});';
 		return $js;
 	}
 }

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;
 	}