phpMv / phpMv-UI

Ajax/semantic/html/collections/menus/HtmlMenu.php

Spacing +27 added lines, -27 removed lines

@@ -41,12 +41,12 @@ 
 	 * @return HtmlMenu
 	 */
 	public function setType($type="") {
-		return $this->addToPropertyCtrl("class", $type, array ("","item","text" ));
+		return $this->addToPropertyCtrl("class", $type, array("", "item", "text"));
 	}
 
 	public function setActiveItem($index) {
 		$item=$this->getItem($index);
-		if ($item !== null) {
+		if ($item!==null) {
 			$item->addToProperty("class", "active");
 		}
 		return $this;
@@ -54,7 +54,7 @@ 
 
 	private function getItemToInsert($item) {
 		if ($item instanceof HtmlInput || $item instanceof HtmlImg || $item instanceof HtmlIcon || $item instanceof HtmlButtonGroups || $item instanceof HtmlButton || $item instanceof HtmlLabel) {
-			$itemO=new HtmlMenuItem("item-" . $this->identifier . "-" . \sizeof($this->content) , $item);
+			$itemO=new HtmlMenuItem("item-".$this->identifier."-".\sizeof($this->content), $item);
 			$itemO->addClass("no-active");
 			$item=$itemO;
 		}
@@ -63,7 +63,7 @@ 
 
 	private function afterInsert($item) {
 		if (!$item instanceof HtmlMenu && $item->propertyContains("class", "header")===false)
-			$item->addToPropertyCtrl("class", "item", array ("item" ));
+			$item->addToPropertyCtrl("class", "item", array("item"));
 		else {
 			$this->setSecondary();
 		}
@@ -79,7 +79,7 @@ 
 	public function addItem($item) {
 		$number=$item;
 		$item=parent::addItem($this->getItemToInsert($item));
-		if(\is_int($number))
+		if (\is_int($number))
 			$item->setProperty("data-page", $number);
 		return $this->afterInsert($item);
 	}
@@ -97,15 +97,15 @@ 
 
 	public function generateMenuAsItem($menu, $header=null) {
 		$count=$this->count();
-		$item=new HtmlSemDoubleElement("item-" . $this->identifier . "-" . $count, "div");
+		$item=new HtmlSemDoubleElement("item-".$this->identifier."-".$count, "div");
 		if (isset($header)) {
-			$headerItem=new HtmlSemDoubleElement("item-header-" . $this->identifier . "-" . $count, "div", "header");
+			$headerItem=new HtmlSemDoubleElement("item-header-".$this->identifier."-".$count, "div", "header");
 			$headerItem->setContent($header);
 			$item->addContent($headerItem);
 			$this->_itemHeader=$headerItem;
 		}
-		if(\is_array($menu)){
-			$menu=new HtmlMenu("menu-" . $this->identifier . "-" . $count,$menu);
+		if (\is_array($menu)) {
+			$menu=new HtmlMenu("menu-".$this->identifier."-".$count, $menu);
 		}
 		$menu->setClass("menu");
 		$item->addContent($menu);
@@ -120,7 +120,7 @@ 
 		$value=new HtmlSemDoubleElement($identifier, "a", "browse item", $value);
 		$value->addContent(new HtmlIcon("", "dropdown"));
 		$value=$this->addItem($value);
-		$popup=new HtmlPopup($value, "popup-" . $this->identifier . "-" . $this->count(), $content);
+		$popup=new HtmlPopup($value, "popup-".$this->identifier."-".$this->count(), $content);
 		$popup->setFlowing()->setPosition("bottom left")->setOn("click");
 		$this->wrap("", $popup);
 		return $popup;
@@ -129,7 +129,7 @@ 
 	public function addDropdownAsItem($value, $items=NULL) {
 		$dd=$value;
 		if (\is_string($value)) {
-			$dd=new HtmlDropdown("dropdown-" . $this->identifier . "-" . $this->count(), $value, $items);
+			$dd=new HtmlDropdown("dropdown-".$this->identifier."-".$this->count(), $value, $items);
 		}
 		$this->addItem($dd);
 		return $dd;
@@ -142,14 +142,14 @@ 
 	 * @see HtmlCollection::createItem()
 	 */
 	protected function createItem($value) {
-		$itemO=new HtmlMenuItem($this->identifier."-item-" . \sizeof($this->content),"");
+		$itemO=new HtmlMenuItem($this->identifier."-item-".\sizeof($this->content), "");
 		$itemO->setTagName("a");
 		$itemO->setContent($value);
 		return $itemO;
 	}
 
 	public function setSecondary($value=true) {
-		if($value)
+		if ($value)
 			$this->addToProperty("class", "secondary");
 		else
 			$this->removePropertyValue("class", "secondary");
@@ -157,28 +157,28 @@ 
 	}
 
 	public function setVertical() {
-		return $this->addToPropertyCtrl("class", "vertical", array ("vertical" ));
+		return $this->addToPropertyCtrl("class", "vertical", array("vertical"));
 	}
 
 	public function setPosition($value="right") {
-		return $this->addToPropertyCtrl("class", $value, array ("right","left" ));
+		return $this->addToPropertyCtrl("class", $value, array("right", "left"));
 	}
 
 	public function setPointing($value=Direction::NONE) {
-		return $this->addToPropertyCtrl("class", $value . " pointing", Direction::getConstantValues("pointing"));
+		return $this->addToPropertyCtrl("class", $value." pointing", Direction::getConstantValues("pointing"));
 	}
 
 	public function asTab($vertical=false) {
-		$this->apply(function (HtmlDoubleElement &$item) {
+		$this->apply(function(HtmlDoubleElement &$item) {
 			$item->setTagName("a");
 		});
-		if ($vertical === true)
+		if ($vertical===true)
 			$this->setVertical();
 		return $this->addToProperty("class", "tabular");
 	}
 
 	public function asPagination() {
-		$this->apply(function (HtmlDoubleElement &$item) {
+		$this->apply(function(HtmlDoubleElement &$item) {
 			$item->setTagName("a");
 		});
 		return $this->addToProperty("class", "pagination");
@@ -215,10 +215,10 @@ 
 	 */
 	public function setWidth($width) {
 		if (\is_int($width)) {
-			$width=Wide::getConstants()["W" . $width];
+			$width=Wide::getConstants()["W".$width];
 		}
 		$this->addToPropertyCtrl("class", $width, Wide::getConstants());
-		return $this->addToPropertyCtrl("class", "item", array ("item" ));
+		return $this->addToPropertyCtrl("class", "item", array("item"));
 	}
 
 	public function addImage($identifier, $src="", $alt="") {
@@ -233,14 +233,14 @@ 
 		return $this->_itemHeader;
 	}
 
-	public function setHasContainer(){
-		return $this->wrapContent("<div class='ui container'>","</div>");
+	public function setHasContainer() {
+		return $this->wrapContent("<div class='ui container'>", "</div>");
 	}
 
-	public function run(JsUtils $js){
-		if($this->identifier!=="" && !isset($this->_bsComponent))
-			$this->onClick('if(!$(this).hasClass("dropdown")&&!$(this).hasClass("no-active")){$(this).addClass("active").siblings().removeClass("active");}',false,false);
-		$result= parent::run($js);
+	public function run(JsUtils $js) {
+		if ($this->identifier!=="" && !isset($this->_bsComponent))
+			$this->onClick('if(!$(this).hasClass("dropdown")&&!$(this).hasClass("no-active")){$(this).addClass("active").siblings().removeClass("active");}', false, false);
+		$result=parent::run($js);
 		return $result->setItemSelector(">.item");
 	}
 }

Ajax/common/traits/JsUtilsAjaxTrait.php

Spacing +181 added lines, -181 removed lines

@@ -16,56 +16,56 @@ 
 
 	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 _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false, $immediatly=true);
 
-	abstract public function interval($jsCode, $time, $globalName = null, $immediatly = true);
+	abstract public function interval($jsCode, $time, $globalName=null, $immediatly=true);
 
-	protected function _ajax($method, $url, $responseElement = "", $parameters = []) {
+	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)) {
+		$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 === "internal") {
-			$retour .= "\n$(this).addClass('loading');";
+		} elseif ($hasLoader==="internal") {
+			$retour.="\n$(this).addClass('loading');";
 		}
-		$ajaxParameters = [
+		$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);
+			$ajaxParameters["data"]=self::_correctParams($params, $parameters);
 		}
 		if (isset($headers)) {
-			$ajaxParameters["headers"] = $headers;
+			$ajaxParameters["headers"]=$headers;
 		}
 		$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.="$.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);
 		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%}",
@@ -73,21 +73,21 @@ 
 		];
 		foreach ($validParameters as $param => $mask) {
 			if (isset($parameters[$param])) {
-				$original[$param] = \str_replace("%value%", $parameters[$param], $mask);
+				$original[$param]=\str_replace("%value%", $parameters[$param], $mask);
 			}
 		}
 	}
 
 	protected function implodeAjaxParameters($ajaxParameters) {
-		$s = '';
+		$s='';
 		foreach ($ajaxParameters as $k => $v) {
-			if ($s !== '') {
-				$s .= ',';
+			if ($s!=='') {
+				$s.=',';
 			}
 			if (is_array($v)) {
-				$s .= "'{$k}':{" . self::implodeAjaxParameters($v) . "}";
+				$s.="'{$k}':{".self::implodeAjaxParameters($v)."}";
 			} else {
-				$s .= "'{$k}':{$v}";
+				$s.="'{$k}':{$v}";
 			}
 		}
 		return $s;
@@ -95,27 +95,27 @@ 
 
 	protected function _addJsCondition($jsCondition, $jsSource) {
 		if (isset($jsCondition)) {
-			return "if(" . $jsCondition . "){\n" . $jsSource . "\n}";
+			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 = "";
+		$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";
+			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;
 	}
@@ -124,91 +124,91 @@ 
 		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;
+	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);
+				$call=$this->setAjaxDataCall($ajaxTransition);
 			} elseif (isset($this->ajaxTransition)) {
-				$call = $this->ajaxTransition;
+				$call=$this->ajaxTransition;
 			}
 			if (\is_callable($call))
-				$retour = "\t" . $call($responseElement, $jqueryDone) . ";\n";
+				$retour="\t".$call($responseElement, $jqueryDone).";\n";
 			else
-				$retour = "\t{$responseElement}.{$jqueryDone}( data );\n";
+				$retour="\t{$responseElement}.{$jqueryDone}( data );\n";
 		}
 		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);
+			$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 = []) {
+	public static function _correctParams($params, $ajaxParameters=[]) {
 		if (JString::isNull($params)) {
 			return "";
 		}
 		if (\preg_match("@^\{.*?\}$@", $params)) {
-			if (! isset($ajaxParameters['contentType']) || ! UString::contains('json', $ajaxParameters['contentType'])) {
-				return '$.param(' . $params . ')';
+			if (!isset($ajaxParameters['contentType']) || !UString::contains('json', $ajaxParameters['contentType'])) {
+				return '$.param('.$params.')';
 			} else {
-				return 'JSON.stringify(' . $params . ')';
+				return 'JSON.stringify('.$params.')';
 			}
 		}
 		return $params;
 	}
 
 	public static function _implodeParams($parameters) {
-		$allParameters = [];
+		$allParameters=[];
 		foreach ($parameters as $params) {
 			if (isset($params))
-				$allParameters[] = self::_correctParams($params);
+				$allParameters[]=self::_correctParams($params);
 		}
 		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">' . $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) {
+		$result=null;
+		if (!\is_callable($params)) {
+			$result=function($responseElement, $jqueryDone="html") use ($params) {
 				return AjaxTransition::{$params}($responseElement, $jqueryDone);
 			};
 		}
@@ -217,13 +217,13 @@ 
 
 	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) {
-		$this->ajaxLoader = $loader;
+		$this->ajaxLoader=$loader;
 	}
 
 	/**
@@ -234,7 +234,7 @@ 
 	 * @param string $responseElement
 	 *        	selector of the HTML element displaying the answer
 	 */
-	private function _get($url, $responseElement = "", $parameters = []) {
+	private function _get($url, $responseElement="", $parameters=[]) {
 		return $this->_ajax("get", $url, $responseElement, $parameters);
 	}
 
@@ -248,8 +248,8 @@ 
 	 * @param array $parameters
 	 *        	default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null,"historize"=>false)
 	 */
-	public function get($url, $responseElement = "", $parameters = []) {
-		$parameters["immediatly"] = true;
+	public function get($url, $responseElement="", $parameters=[]) {
+		$parameters["immediatly"]=true;
 		return $this->_get($url, $responseElement, $parameters);
 	}
 
@@ -265,8 +265,8 @@ 
 	 * @param array $parameters
 	 *        	default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null,"historize"=>false)
 	 */
-	public function ajax($method, $url, $responseElement = "", $parameters = []) {
-		$parameters["immediatly"] = true;
+	public function ajax($method, $url, $responseElement="", $parameters=[]) {
+		$parameters["immediatly"]=true;
 		return $this->_ajax($method, $url, $responseElement, $parameters);
 	}
 
@@ -286,7 +286,7 @@ 
 	 *        	The ajax parameters, default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null,"historize"=>false)
 	 * @return string
 	 */
-	public function ajaxInterval($method, $url, $interval, $globalName = null, $responseElement = "", $parameters = []) {
+	public function ajaxInterval($method, $url, $interval, $globalName=null, $responseElement="", $parameters=[]) {
 		return $this->interval($this->ajaxDeferred($method, $url, $responseElement, $parameters), $interval, $globalName);
 	}
 
@@ -302,8 +302,8 @@ 
 	 * @param array $parameters
 	 *        	default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null,"historize"=>false)
 	 */
-	public function ajaxDeferred($method, $url, $responseElement = "", $parameters = []) {
-		$parameters["immediatly"] = false;
+	public function ajaxDeferred($method, $url, $responseElement="", $parameters=[]) {
+		$parameters["immediatly"]=false;
 		return $this->_ajax($method, $url, $responseElement, $parameters);
 	}
 
@@ -317,15 +317,15 @@ 
 	 * @param array $parameters
 	 *        	default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","context"=>"document","jsCondition"=>NULL,"headers"=>null,"immediatly"=>false)
 	 */
-	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;
+		$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);
 	}
 
@@ -339,7 +339,7 @@ 
 	 * @param array $parameters
 	 *        	default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","context"=>"document","jsCondition"=>NULL,"headers"=>null,"immediatly"=>false)
 	 */
-	public function json($url, $method = "get", $parameters = []) {
+	public function json($url, $method="get", $parameters=[]) {
 		return $this->_json($url, $method, $parameters);
 	}
 
@@ -355,7 +355,7 @@ 
 	 * @param array $parameters
 	 *        	default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","params"=>"{}","method"=>"get","immediatly"=>true)
 	 */
-	public function jsonOn($event, $element, $url, $method = "get", $parameters = array()) {
+	public function jsonOn($event, $element, $url, $method="get", $parameters=array()) {
 		$this->setDefaultParameters($parameters, [
 			"preventDefault" => true,
 			"stopPropagation" => true,
@@ -374,8 +374,8 @@ 
 	 * @param array $parameters
 	 *        	default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","context"=>"document","jsCondition"=>NULL,"headers"=>null,"immediatly"=>false)
 	 */
-	public function jsonDeferred($url, $method = "get", $parameters = []) {
-		$parameters["immediatly"] = false;
+	public function jsonDeferred($url, $method="get", $parameters=[]) {
+		$parameters["immediatly"]=false;
 		return $this->_json($url, $method, $parameters);
 	}
 
@@ -390,29 +390,29 @@ 
 	 * @param array $parameters
 	 *        	default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","context"=>null,"jsCondition"=>NULL,"headers"=>null,"immediatly"=>false,"rowClass"=>"_json")
 	 */
-	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;
+		$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);
 	}
 
@@ -427,7 +427,7 @@ 
 	 * @param array $parameters
 	 *        	default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","context"=>null,"jsCondition"=>NULL,"headers"=>null,"immediatly"=>false,"rowClass"=>"_json")
 	 */
-	public function jsonArray($maskSelector, $url, $method = "get", $parameters = []) {
+	public function jsonArray($maskSelector, $url, $method="get", $parameters=[]) {
 		return $this->_jsonArray($maskSelector, $url, $method, $parameters);
 	}
 
@@ -442,8 +442,8 @@ 
 	 * @param array $parameters
 	 *        	default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","context"=>null,"jsCondition"=>NULL,"headers"=>null,"rowClass"=>"_json")
 	 */
-	public function jsonArrayDeferred($maskSelector, $url, $method = "get", $parameters) {
-		$parameters["immediatly"] = false;
+	public function jsonArrayDeferred($maskSelector, $url, $method="get", $parameters) {
+		$parameters["immediatly"]=false;
 		return $this->jsonArray($maskSelector, $url, $method, $parameters);
 	}
 
@@ -459,7 +459,7 @@ 
 	 * @param array $parameters
 	 *        	default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","params"=>"{}","method"=>"get","rowClass"=>"_json","immediatly"=>true)
 	 */
-	public function jsonArrayOn($event, $element, $maskSelector, $url, $method = "get", $parameters = array()) {
+	public function jsonArrayOn($event, $element, $maskSelector, $url, $method="get", $parameters=array()) {
 		$this->setDefaultParameters($parameters, [
 			"preventDefault" => true,
 			"stopPropagation" => true,
@@ -479,8 +479,8 @@ 
 	 * @param array $parameters
 	 *        	default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null,"historize"=>false)
 	 */
-	public function getDeferred($url, $responseElement = "", $parameters = []) {
-		$parameters["immediatly"] = false;
+	public function getDeferred($url, $responseElement="", $parameters=[]) {
+		$parameters["immediatly"]=false;
 		return $this->_get($url, $responseElement, $parameters);
 	}
 
@@ -499,7 +499,7 @@ 
 	 * @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)
 	 */
-	public function getOn($event, $element, $url, $responseElement = "", $parameters = array()) {
+	public function getOn($event, $element, $url, $responseElement="", $parameters=array()) {
 		$this->setDefaultParameters($parameters, [
 			"preventDefault" => true,
 			"stopPropagation" => true,
@@ -523,7 +523,7 @@ 
 	 * @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)
 	 */
-	public function ajaxOn($event, $element, $url, $responseElement = "", $parameters = array()) {
+	public function ajaxOn($event, $element, $url, $responseElement="", $parameters=array()) {
 		$this->setDefaultParameters($parameters, [
 			"preventDefault" => true,
 			"stopPropagation" => true,
@@ -546,7 +546,7 @@ 
 	 * @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)
 	 */
-	public function ajaxOnClick($element, $url, $responseElement = "", $parameters = array()) {
+	public function ajaxOnClick($element, $url, $responseElement="", $parameters=array()) {
 		return $this->ajaxOn("click", $element, $url, $responseElement, $parameters);
 	}
 
@@ -563,7 +563,7 @@ 
 	 * @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)
 	 */
-	public function getOnClick($element, $url, $responseElement = "", $parameters = array()) {
+	public function getOnClick($element, $url, $responseElement="", $parameters=array()) {
 		return $this->getOn("click", $element, $url, $responseElement, $parameters);
 	}
 
@@ -578,13 +578,13 @@ 
 	 *        	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)
 	 * @return $this
 	 */
-	public function getHref($element, $responseElement = "", $parameters = array()) {
-		$parameters["attr"] = "href";
+	public function getHref($element, $responseElement="", $parameters=array()) {
+		$parameters["attr"]="href";
 		if (JString::isNull($responseElement)) {
-			$responseElement = '%$(self).attr("data-target")%';
+			$responseElement='%$(self).attr("data-target")%';
 		}
-		if (! isset($parameters["historize"])) {
-			$parameters["historize"] = true;
+		if (!isset($parameters["historize"])) {
+			$parameters["historize"]=true;
 		}
 		return $this->getOnClick($element, "", $responseElement, $parameters);
 	}
@@ -600,19 +600,19 @@ 
 	 *        	default : array("preventDefault"=>true,"stopPropagation"=>true,"params"=>"{}","jsCallback"=>NULL,"attr"=>"href","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","jsCondition"=>NULL,"headers"=>null,"historize"=>false)
 	 * @return $this
 	 */
-	public function postHref($element, $responseElement = "", $parameters = array()) {
-		$parameters["attr"] = "href";
+	public function postHref($element, $responseElement="", $parameters=array()) {
+		$parameters["attr"]="href";
 		if (JString::isNull($responseElement)) {
-			$responseElement = '%$(this).attr("data-target")%';
+			$responseElement='%$(this).attr("data-target")%';
 		}
-		if (! isset($parameters["historize"])) {
-			$parameters["historize"] = true;
+		if (!isset($parameters["historize"])) {
+			$parameters["historize"]=true;
 		}
 		return $this->postOnClick($element, "", "{}", $responseElement, $parameters);
 	}
 
-	private function _post($url, $params = "{}", $responseElement = "", $parameters = []) {
-		$parameters["params"] = $params;
+	private function _post($url, $params="{}", $responseElement="", $parameters=[]) {
+		$parameters["params"]=$params;
 		return $this->_ajax("POST", $url, $responseElement, $parameters);
 	}
 
@@ -628,7 +628,7 @@ 
 	 * @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)
 	 */
-	public function post($url, $params = "{}", $responseElement = "", $parameters = []) {
+	public function post($url, $params="{}", $responseElement="", $parameters=[]) {
 		return $this->_post($url, $params, $responseElement, $parameters);
 	}
 
@@ -645,8 +645,8 @@ 
 	 * @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)
 	 */
-	public function postDeferred($url, $params = "{}", $responseElement = "", $parameters = []) {
-		$parameters["immediatly"] = false;
+	public function postDeferred($url, $params="{}", $responseElement="", $parameters=[]) {
+		$parameters["immediatly"]=false;
 		return $this->_post($url, $params, $responseElement, $parameters);
 	}
 
@@ -665,7 +665,7 @@ 
 	 * @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)
 	 */
-	public function postOn($event, $element, $url, $params = "{}", $responseElement = "", $parameters = array()) {
+	public function postOn($event, $element, $url, $params="{}", $responseElement="", $parameters=array()) {
 		$this->setDefaultParameters($parameters, [
 			"preventDefault" => true,
 			"stopPropagation" => true,
@@ -688,66 +688,66 @@ 
 	 * @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)
 	 */
-	public function postOnClick($element, $url, $params = "{}", $responseElement = "", $parameters = array()) {
+	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 = []) {
+	private function _postForm($url, $form, $responseElement, $parameters=[]) {
 		if (isset($this->params["ajax"])) {
 			extract($this->params["ajax"]);
 		}
-		$params = "{}";
-		$validation = false;
-		$hasFiles = false;
+		$params="{}";
+		$validation=false;
+		$hasFiles=false;
 		\extract($parameters);
-		$async = ($async) ? "true" : "false";
-		$jsCallback = isset($jsCallback) ? $jsCallback : "";
-		$retour = $this->_getAjaxUrl($url, $attr);
-		$retour .= "\n$('#" . $form . "').trigger('ajaxSubmit');";
-		if (! $hasFiles) {
-			$retour .= "\nvar params=$('#" . $form . "').serialize();\n";
+		$async=($async) ? "true" : "false";
+		$jsCallback=isset($jsCallback) ? $jsCallback : "";
+		$retour=$this->_getAjaxUrl($url, $attr);
+		$retour.="\n$('#".$form."').trigger('ajaxSubmit');";
+		if (!$hasFiles) {
+			$retour.="\nvar params=$('#".$form."').serialize();\n";
 			if (isset($params)) {
-				$retour .= "params+='&'+" . self::_correctParams($params) . ";\n";
+				$retour.="params+='&'+".self::_correctParams($params).";\n";
 			}
-			$ajaxParameters = [];
+			$ajaxParameters=[];
 		} else {
-			$retour .= "\nvar params=new FormData($('#" . $form . "')[0]);\n";
-			$ajaxParameters = [
+			$retour.="\nvar params=new FormData($('#".$form."')[0]);\n";
+			$ajaxParameters=[
 				'enctype' => "'multipart/form-data'",
 				'processData' => "false",
 				'contentType' => "false",
 				'timeout' => 600000
 			];
 		}
-		$responseElement = $this->_getResponseElement($responseElement);
-		$retour .= "var self=this;\n";
-		if ($hasLoader === true) {
+		$responseElement=$this->_getResponseElement($responseElement);
+		$retour.="var self=this;\n";
+		if ($hasLoader===true) {
 			$this->addLoading($retour, $responseElement, $ajaxLoader);
-		} elseif ($hasLoader === "internal") {
-			$retour .= "\n$(this).addClass('loading');";
+		} elseif ($hasLoader==="internal") {
+			$retour.="\n$(this).addClass('loading');";
 		}
-		$ajaxParameters = [
+		$ajaxParameters=[
 			"url" => "url",
 			"method" => "'POST'",
 			"data" => "params",
 			"async" => $async
-		] + $ajaxParameters;
+		]+$ajaxParameters;
 		if (isset($headers)) {
-			$ajaxParameters["headers"] = $headers;
+			$ajaxParameters["headers"]=$headers;
 		}
 		$this->createAjaxParameters($ajaxParameters, $parameters);
-		$retour .= "$.ajax({" . $this->implodeAjaxParameters($ajaxParameters) . "}).done(function( data ) {\n";
-		$retour .= $this->_getOnAjaxDone($responseElement, $jqueryDone, $ajaxTransition, $jsCallback, $hasLoader) . "});\n";
+		$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;
 	}
 
@@ -763,8 +763,8 @@ 
 	 * @param array $parameters
 	 *        	default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null,"historize"=>false)
 	 */
-	public function postForm($url, $form, $responseElement, $parameters = []) {
-		$parameters["immediatly"] = true;
+	public function postForm($url, $form, $responseElement, $parameters=[]) {
+		$parameters["immediatly"]=true;
 		return $this->_postForm($url, $form, $responseElement, $parameters);
 	}
 
@@ -781,8 +781,8 @@ 
 	 * @param array $parameters
 	 *        	default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null,"historize"=>false)
 	 */
-	public function postFormDeferred($url, $form, $responseElement, $parameters = []) {
-		$parameters["immediatly"] = false;
+	public function postFormDeferred($url, $form, $responseElement, $parameters=[]) {
+		$parameters["immediatly"]=false;
 		return $this->_postForm($url, $form, $responseElement, $parameters);
 	}
 
@@ -799,7 +799,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)
 	 */
-	public function postFormOn($event, $element, $url, $form, $responseElement = "", $parameters = array()) {
+	public function postFormOn($event, $element, $url, $form, $responseElement="", $parameters=array()) {
 		$this->setDefaultParameters($parameters, [
 			"preventDefault" => true,
 			"stopPropagation" => true,
@@ -820,7 +820,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)
 	 */
-	public function postFormOnClick($element, $url, $form, $responseElement = "", $parameters = array()) {
+	public function postFormOnClick($element, $url, $form, $responseElement="", $parameters=array()) {
 		return $this->postFormOn("click", $element, $url, $form, $responseElement, $parameters);
 	}
 }

Ajax/semantic/html/modules/HtmlTab.php

Spacing +43 added lines, -43 removed lines

@@ -18,15 +18,15 @@ 
  */
 class HtmlTab extends HtmlSemCollection {
 
-	protected $params = [];
+	protected $params=[];
 
-	protected $_activated = false;
+	protected $_activated=false;
 
-	public function __construct($identifier, $tabs = array()) {
+	public function __construct($identifier, $tabs=array()) {
 		parent::__construct($identifier, "div", "");
-		$menu = new HtmlMenu("menu" . $this->identifier);
+		$menu=new HtmlMenu("menu".$this->identifier);
 		$menu->asTab(false)->setAttachment(NULL, Side::TOP);
-		$this->content["menu"] = $menu;
+		$this->content["menu"]=$menu;
 		$this->addItems($tabs);
 	}
 
@@ -37,18 +37,18 @@ 
 	 * @return HtmlSegment
 	 */
 	protected function createItem($value) {
-		$count = $this->count();
-		$title = $value;
-		$content = NULL;
+		$count=$this->count();
+		$title=$value;
+		$content=NULL;
 		if (\is_array($value)) {
-			$title = @$value[0];
-			$content = @$value[1];
+			$title=@$value[0];
+			$content=@$value[1];
 		}
-		$menuItem = $this->content["menu"]->addItem($title);
+		$menuItem=$this->content["menu"]->addItem($title);
 		$menuItem->addToProperty("data-tab", $menuItem->getIdentifier());
 		$menuItem->removeProperty("href");
-		$result = $this->createSegment($count, $content, $menuItem->getIdentifier());
-		$result->menuTab = $menuItem;
+		$result=$this->createSegment($count, $content, $menuItem->getIdentifier());
+		$result->menuTab=$menuItem;
 		return $result;
 	}
 
@@ -60,7 +60,7 @@ 
 	 * @return \Ajax\semantic\html\elements\HtmlSegment
 	 */
 	private function createSegment($count, $content, $datatab) {
-		$segment = new HtmlSegment("item-" . $this->identifier . "-" . $count, $content);
+		$segment=new HtmlSegment("item-".$this->identifier."-".$count, $content);
 		$segment->setAttachment(NULL, Side::BOTTOM)
 			->addToProperty("class", "tab")
 			->addToProperty("data-tab", $datatab);
@@ -77,10 +77,10 @@ 
 	 * @return \Ajax\semantic\html\modules\HtmlTab
 	 */
 	public function setTabContent($index, $content) {
-		$menu = $this->content["menu"];
-		if ($index < $menu->count()) {
-			if (isset($this->content[$index]) === false) {
-				$this->content[$index] = $this->createSegment($index, $content, $menu->getItem($index)
+		$menu=$this->content["menu"];
+		if ($index<$menu->count()) {
+			if (isset($this->content[$index])===false) {
+				$this->content[$index]=$this->createSegment($index, $content, $menu->getItem($index)
 					->getIdentifier());
 			} else
 				$this->content[$index]->setContent($content);
@@ -95,8 +95,8 @@ 
 	 * @return \Ajax\semantic\html\modules\HtmlTab
 	 */
 	public function setTabsContent($contents) {
-		$size = \sizeof($contents);
-		for ($i = 0; $i < $size; $i ++) {
+		$size=\sizeof($contents);
+		for ($i=0; $i<$size; $i++) {
 			$this->setTabContent($i, $contents[$i]);
 		}
 		return $this;
@@ -109,11 +109,11 @@ 
 	 * @return \Ajax\semantic\html\modules\HtmlTab
 	 */
 	public function activate($index) {
-		$item = $this->content["menu"]->getItem($index);
-		if ($item != null) {
+		$item=$this->content["menu"]->getItem($index);
+		if ($item!=null) {
 			$item->setActive(true);
 			$this->content[$index]->setActive(true);
-			$this->_activated = true;
+			$this->_activated=true;
 		}
 		return $this;
 	}
@@ -147,9 +147,9 @@ 
 	 * @param array $params
 	 * @return \Ajax\semantic\html\elements\HtmlSegment
 	 */
-	public function forwardTab($index, JsUtils $js, $title, $initialController, $controller, $action, $params = array()) {
+	public function forwardTab($index, JsUtils $js, $title, $initialController, $controller, $action, $params=array()) {
 		if (\array_key_exists($index, $this->content)) {
-			$this->content[$index] = $js->forward($initialController, $controller, $action, $params);
+			$this->content[$index]=$js->forward($initialController, $controller, $action, $params);
 			return $this->content[$index];
 		}
 
@@ -170,9 +170,9 @@ 
 	 *        	The parameters to pass to the view
 	 * @return \Ajax\semantic\html\elements\HtmlSegment
 	 */
-	public function renderViewTab($index, JsUtils $js, $title, $initialController, $viewName, $params = array()) {
+	public function renderViewTab($index, JsUtils $js, $title, $initialController, $viewName, $params=array()) {
 		if (\array_key_exists($index, $this->content)) {
-			$this->content[$index] = $js->renderContent($initialController, $viewName, $params);
+			$this->content[$index]=$js->renderContent($initialController, $viewName, $params);
 			return $this->content[$index];
 		}
 		return $this->addAndRenderViewTab($js, $title, $initialController, $viewName, $params);
@@ -192,10 +192,10 @@ 
 	 * @param array $params
 	 * @return \Ajax\semantic\html\elements\HtmlSegment
 	 */
-	public function addAndForwardTab(JsUtils $js, $title, $initialController, $controller, $action, $params = array()) {
+	public function addAndForwardTab(JsUtils $js, $title, $initialController, $controller, $action, $params=array()) {
 		\ob_start();
 		$js->forward($initialController, $controller, $action, $params);
-		$content = \ob_get_clean();
+		$content=\ob_get_clean();
 		return $this->addTab($title, $content);
 	}
 
@@ -211,11 +211,11 @@ 
 	 *        	The parameters to pass to the view
 	 * @return \Ajax\semantic\html\elements\HtmlSegment
 	 */
-	public function addAndRenderViewTab(JsUtils $js, $title, $initialController, $viewName, $params = array()) {
+	public function addAndRenderViewTab(JsUtils $js, $title, $initialController, $viewName, $params=array()) {
 		return $this->addTab($title, $js->renderContent($initialController, $viewName, $params));
 	}
 
-	public function setPointing($value = Direction::NONE) {
+	public function setPointing($value=Direction::NONE) {
 		return $this->content["menu"]->setPointing($value);
 	}
 
@@ -250,25 +250,25 @@ 
 	 * @return \Ajax\semantic\html\modules\HtmlTab
 	 */
 	public function setMenu($menu) {
-		$contentSize = \sizeof($this->content);
-		for ($i = 0; $i < $contentSize; $i ++) {
-			if ($menu->getItem($i) !== NULL) {
+		$contentSize=\sizeof($this->content);
+		for ($i=0; $i<$contentSize; $i++) {
+			if ($menu->getItem($i)!==NULL) {
 				if (isset($this->content[$i])) {
 					$menu->getItem($i)->addToProperty("data-tab", $this->content[$i]->getProperty("data-tab"));
 				}
 			}
 		}
-		$menuSize = $menu->count();
-		for ($i = 0; $i < $menuSize; $i ++) {
+		$menuSize=$menu->count();
+		for ($i=0; $i<$menuSize; $i++) {
 			$menu->getItem($i)->removeProperty("href");
-			if (isset($this->content[$i]) === false) {
-				$this->content[$i] = $this->createSegment($i, "New content", $menu->getItem($i)
+			if (isset($this->content[$i])===false) {
+				$this->content[$i]=$this->createSegment($i, "New content", $menu->getItem($i)
 					->getIdentifier());
 			}
 			$menu->getItem($i)->addToProperty("data-tab", $this->content[$i]->getProperty("data-tab"));
 		}
 
-		$this->content["menu"] = $menu;
+		$this->content["menu"]=$menu;
 		return $this;
 	}
 
@@ -277,14 +277,14 @@ 
 	 * @see BaseHtml::run()
 	 */
 	public function run(JsUtils $js) {
-		if (isset($this->_bsComponent) === false)
-			$this->_bsComponent = $js->semantic()->tab("#" . $this->identifier . " .item", $this->params);
+		if (isset($this->_bsComponent)===false)
+			$this->_bsComponent=$js->semantic()->tab("#".$this->identifier." .item", $this->params);
 		$this->addEventsOnRun($js);
 		return $this->_bsComponent;
 	}
 
-	public function compile(JsUtils $js = NULL, &$view = NULL) {
-		if (! $this->_activated && $this->content["menu"]->count() > 0 && \sizeof($this->content) > 1)
+	public function compile(JsUtils $js=NULL, &$view=NULL) {
+		if (!$this->_activated && $this->content["menu"]->count()>0 && \sizeof($this->content)>1)
 			$this->activate(0);
 		return parent::compile($js, $view);
 	}

Ajax/semantic/components/Dropdown.php

Spacing +3 added lines, -3 removed lines

@@ -7,7 +7,7 @@ 
 
 	public function __construct(JsUtils $js) {
 		parent::__construct($js);
-		$this->uiName = "dropdown";
+		$this->uiName="dropdown";
 	}
 
 	/**
@@ -56,10 +56,10 @@ 
 	}
 
 	public function setOnAdd($value) {
-		$this->params["onAdd"] = "%function(addedValue, addedText, \$addedChoice){" . $value . "}%";
+		$this->params["onAdd"]="%function(addedValue, addedText, \$addedChoice){".$value."}%";
 	}
 
 	public function setOnRemove($value) {
-		$this->params["onRemove"] = "%function(removedValue, removedText, \$removedChoice){" . $value . "}%";
+		$this->params["onRemove"]="%function(removedValue, removedText, \$removedChoice){".$value."}%";
 	}
 }

Ajax/semantic/html/modules/HtmlDropdown.php

Spacing +91 added lines, -91 removed lines

@@ -13,17 +13,17 @@ 
 use Ajax\common\html\HtmlDoubleElement;
 
 class HtmlDropdown extends HtmlSemDoubleElement {
-	use FieldTrait,LabeledIconTrait {
+	use FieldTrait, LabeledIconTrait {
 		addIcon as addIconP;
 	}
 
-	protected $mClass = "menu";
+	protected $mClass="menu";
 
-	protected $mTagName = "div";
+	protected $mTagName="div";
 
-	protected $items = array();
+	protected $items=array();
 
-	protected $_params = array(
+	protected $_params=array(
 		"action" => "nothing",
 		"on" => "hover",
 		"showOnFocus" => true
@@ -37,28 +37,28 @@ 
 
 	protected $_multiple;
 
-	public function __construct($identifier, $value = "", $items = array(), $associative = true) {
+	public function __construct($identifier, $value="", $items=array(), $associative=true) {
 		parent::__construct($identifier, "div");
-		$this->_template = include dirname(__FILE__) . '/../templates/tplDropdown.php';
+		$this->_template=include dirname(__FILE__).'/../templates/tplDropdown.php';
 		$this->setProperty("class", "ui dropdown");
-		$this->_multiple = false;
-		$content = [];
+		$this->_multiple=false;
+		$content=[];
 		if (isset($value)) {
 			if ($value instanceof HtmlSemDoubleElement) {
-				$text = $value;
+				$text=$value;
 			} else {
-				$text = new HtmlSemDoubleElement("text-" . $this->identifier, "div");
+				$text=new HtmlSemDoubleElement("text-".$this->identifier, "div");
 				$text->setClass("text");
 				$this->setValue($value);
 			}
-			$content = [
+			$content=[
 				"text" => $text
 			];
 		}
-		$content["arrow"] = new HtmlIcon($identifier . "-icon", "dropdown");
-		$this->content = $content;
-		$this->tagName = "div";
-		$this->_associative = $associative;
+		$content["arrow"]=new HtmlIcon($identifier."-icon", "dropdown");
+		$this->content=$content;
+		$this->tagName="div";
+		$this->_associative=$associative;
 		$this->addItems($items);
 	}
 
@@ -70,16 +70,16 @@ 
 		return $this->input;
 	}
 
-	public function addItem($item, $value = NULL, $image = NULL, $description = NULL) {
-		$itemO = $this->beforeAddItem($item, $value, $image, $description);
-		$this->items[] = $itemO;
+	public function addItem($item, $value=NULL, $image=NULL, $description=NULL) {
+		$itemO=$this->beforeAddItem($item, $value, $image, $description);
+		$this->items[]=$itemO;
 		return $itemO;
 	}
 
-	public function addIcon($icon, $before = true, $labeled = false) {
+	public function addIcon($icon, $before=true, $labeled=false) {
 		$this->removeArrow();
 		$this->addIconP($icon, $before, $labeled);
-		$elm = $this->getElementById("text-" . $this->identifier, $this->content);
+		$elm=$this->getElementById("text-".$this->identifier, $this->content);
 		if (isset($elm)) {
 			$elm->setWrapAfter("");
 		}
@@ -87,8 +87,8 @@ 
 	}
 
 	public function addIcons($icons) {
-		$count = $this->count();
-		for ($i = 0; $i < \sizeof($icons) && $i < $count; $i ++) {
+		$count=$this->count();
+		for ($i=0; $i<\sizeof($icons) && $i<$count; $i++) {
 			$this->getItem($i)->addIcon($icons[$i]);
 		}
 	}
@@ -100,32 +100,32 @@ 
 	 * @param int $position
 	 * @return HtmlDropdownItem
 	 */
-	public function insertItem($item, $position = 0) {
-		$itemO = $this->beforeAddItem($item);
-		$start = array_slice($this->items, 0, $position);
-		$end = array_slice($this->items, $position);
-		$start[] = $item;
-		$this->items = array_merge($start, $end);
+	public function insertItem($item, $position=0) {
+		$itemO=$this->beforeAddItem($item);
+		$start=array_slice($this->items, 0, $position);
+		$end=array_slice($this->items, $position);
+		$start[]=$item;
+		$this->items=array_merge($start, $end);
 		return $itemO;
 	}
 
 	protected function removeArrow() {
-		if (\sizeof($this->content) > 1) {
+		if (\sizeof($this->content)>1) {
 			unset($this->content["arrow"]);
-			$this->content = \array_values($this->content);
+			$this->content=\array_values($this->content);
 		}
 	}
 
-	protected function beforeAddItem($item, $value = NULL, $image = NULL, $description = NULL) {
-		$itemO = $item;
+	protected function beforeAddItem($item, $value=NULL, $image=NULL, $description=NULL) {
+		$itemO=$item;
 		if (\is_array($item)) {
-			$description = JArray::getValue($item, "description", 3);
-			$value = JArray::getValue($item, "value", 1);
-			$image = JArray::getValue($item, "image", 2);
-			$item = JArray::getValue($item, "item", 0);
+			$description=JArray::getValue($item, "description", 3);
+			$value=JArray::getValue($item, "value", 1);
+			$image=JArray::getValue($item, "image", 2);
+			$item=JArray::getValue($item, "item", 0);
 		}
-		if (! $item instanceof HtmlDropdownItem) {
-			$itemO = new HtmlDropdownItem("dd-item-" . $this->identifier . "-" . \sizeof($this->items), $item, $value, $image, $description);
+		if (!$item instanceof HtmlDropdownItem) {
+			$itemO=new HtmlDropdownItem("dd-item-".$this->identifier."-".\sizeof($this->items), $item, $value, $image, $description);
 		} elseif ($itemO instanceof HtmlDropdownItem) {
 			$this->addToProperty("class", "vertical");
 		}
@@ -141,11 +141,11 @@ 
 	}
 
 	public function addInput($name) {
-		if (! isset($name))
-			$name = "input-" . $this->identifier;
+		if (!isset($name))
+			$name="input-".$this->identifier;
 		$this->setAction("activate");
-		$this->input = new HtmlInput($name, "hidden");
-		$this->input->setIdentifier("input-" . $this->identifier);
+		$this->input=new HtmlInput($name, "hidden");
+		$this->input->setIdentifier("input-".$this->identifier);
 		return $this->input;
 	}
 
@@ -156,7 +156,7 @@ 
 	 * @param string $icon
 	 * @return HtmlDropdownItem
 	 */
-	public function addSearchInputItem($placeHolder = NULL, $icon = NULL) {
+	public function addSearchInputItem($placeHolder=NULL, $icon=NULL) {
 		return $this->addItem(HtmlDropdownItem::searchInput($placeHolder, $icon));
 	}
 
@@ -176,7 +176,7 @@ 
 	 * @param string $icon
 	 * @return HtmlDropdownItem
 	 */
-	public function addHeaderItem($caption = NULL, $icon = NULL) {
+	public function addHeaderItem($caption=NULL, $icon=NULL) {
 		return $this->addItem(HtmlDropdownItem::header($caption, $icon));
 	}
 
@@ -221,12 +221,12 @@ 
 	 * @return $this
 	 */
 	public function setPropertyValues($property, $values) {
-		$i = 0;
-		if (\is_array($values) === false) {
-			$values = \array_fill(0, $this->count(), $values);
+		$i=0;
+		if (\is_array($values)===false) {
+			$values=\array_fill(0, $this->count(), $values);
 		}
 		foreach ($values as $value) {
-			$c = $this->items[$i ++];
+			$c=$this->items[$i++];
 			if (isset($c)) {
 				$c->setProperty($property, $value);
 			} else {
@@ -260,12 +260,12 @@ 
 	 * @param boolean $dropdown
 	 */
 	public function asDropdown($dropdown) {
-		if ($dropdown === false) {
-			$this->_template = include dirname(__FILE__) . '/../templates/tplDropdownMenu.php';
-			$dropdown = "menu";
+		if ($dropdown===false) {
+			$this->_template=include dirname(__FILE__).'/../templates/tplDropdownMenu.php';
+			$dropdown="menu";
 		} else {
-			$dropdown = "dropdown";
-			$this->mClass = "menu";
+			$dropdown="dropdown";
+			$this->mClass="menu";
 		}
 		return $this->addToPropertyCtrl("class", $dropdown, array(
 			"menu",
@@ -291,7 +291,7 @@ 
 		));
 	}
 
-	public function asButton($floating = false) {
+	public function asButton($floating=false) {
 		$this->removeArrow();
 		if ($floating)
 			$this->addToProperty("class", "floating");
@@ -299,15 +299,15 @@ 
 		return $this->addToProperty("class", "button");
 	}
 
-	public function asSelect($name = NULL, $multiple = false, $selection = true) {
-		$this->_multiple = $multiple;
+	public function asSelect($name=NULL, $multiple=false, $selection=true) {
+		$this->_multiple=$multiple;
 		if (isset($name))
 			$this->addInput($name);
 		if ($multiple) {
 			$this->addToProperty("class", "multiple");
 		}
 		if ($selection) {
-			if ($this->propertyContains("class", "button") === false)
+			if ($this->propertyContains("class", "button")===false)
 				$this->addToPropertyCtrl("class", "selection", array(
 					"selection"
 				));
@@ -315,31 +315,31 @@ 
 		return $this;
 	}
 
-	public function asSearch($name = NULL, $multiple = false, $selection = true) {
+	public function asSearch($name=NULL, $multiple=false, $selection=true) {
 		$this->asSelect($name, $multiple, $selection);
 		return $this->addToProperty("class", "search");
 	}
 
-	public function setSelect($name = NULL, $multiple = false) {
-		$this->_template = '<%tagName% id="%identifier%" %properties%>%items%</%tagName%>';
-		if (! isset($name))
-			$name = "select-" . $this->identifier;
-		$this->input = null;
+	public function setSelect($name=NULL, $multiple=false) {
+		$this->_template='<%tagName% id="%identifier%" %properties%>%items%</%tagName%>';
+		if (!isset($name))
+			$name="select-".$this->identifier;
+		$this->input=null;
 		if ($multiple) {
 			$this->setProperty("multiple", true);
 			$this->addToProperty("class", "multiple");
 		}
 		$this->setAction("activate");
-		$this->tagName = "select";
+		$this->tagName="select";
 		$this->setProperty("name", $name);
-		$this->content = null;
+		$this->content=null;
 		foreach ($this->items as $item) {
 			$item->asOption();
 		}
 		return $this;
 	}
 
-	public function asSubmenu($pointing = NULL) {
+	public function asSubmenu($pointing=NULL) {
 		$this->setClass("ui dropdown link item");
 		if (isset($pointing)) {
 			$this->setPointing($pointing);
@@ -347,28 +347,28 @@ 
 		return $this;
 	}
 
-	public function setPointing($value = Direction::NONE) {
-		return $this->addToPropertyCtrl("class", $value . " pointing", Direction::getConstantValues("pointing"));
+	public function setPointing($value=Direction::NONE) {
+		return $this->addToPropertyCtrl("class", $value." pointing", Direction::getConstantValues("pointing"));
 	}
 
 	public function setValue($value) {
-		$this->value = $value;
+		$this->value=$value;
 		return $this;
 	}
 
 	public function setDefaultText($text) {
-		$this->content["text"] = new HtmlSemDoubleElement("", "div", "default text", $text);
+		$this->content["text"]=new HtmlSemDoubleElement("", "div", "default text", $text);
 	}
 
 	private function applyValue() {
-		$value = $this->value;
+		$value=$this->value;
 		if (isset($this->input) && isset($value)) {
 			$this->input->setProperty("value", $value);
 		} else {
 			$this->setProperty("value", $value);
 		}
-		$textElement = $this->getElementById("text-" . $this->identifier, $this->content);
-		if (isset($textElement) && ($textElement instanceof HtmlDoubleElement) && ! $this->_multiple)
+		$textElement=$this->getElementById("text-".$this->identifier, $this->content);
+		if (isset($textElement) && ($textElement instanceof HtmlDoubleElement) && !$this->_multiple)
 			$textElement->setContent($value);
 		return $this;
 	}
@@ -378,9 +378,9 @@ 
 	 * @see BaseHtml::run()
 	 */
 	public function run(JsUtils $js) {
-		if ($this->propertyContains("class", "simple") === false) {
-			if (isset($this->_bsComponent) === false) {
-				$this->_bsComponent = $js->semantic()->dropdown("#" . $this->identifier, $this->_params);
+		if ($this->propertyContains("class", "simple")===false) {
+			if (isset($this->_bsComponent)===false) {
+				$this->_bsComponent=$js->semantic()->dropdown("#".$this->identifier, $this->_params);
 				$this->_bsComponent->setItemSelector(".item");
 			}
 			$this->addEventsOnRun($js);
@@ -395,26 +395,26 @@ 
 	}
 
 	public function setAction($action) {
-		$this->_params["action"] = $action;
+		$this->_params["action"]=$action;
 	}
 
 	public function setOn($on) {
-		$this->_params["on"] = $on;
+		$this->_params["on"]=$on;
 	}
 
 	public function setShowOnFocus($value) {
-		$this->_params["showOnFocus"] = $value;
+		$this->_params["showOnFocus"]=$value;
 	}
 
 	public function setAllowAdditions($value) {
-		$this->_params["allowAdditions"] = $value;
+		$this->_params["allowAdditions"]=$value;
 	}
 
 	public function setFullTextSearch($value) {
-		$this->_params["fullTextSearch"] = $value;
+		$this->_params["fullTextSearch"]=$value;
 	}
 
-	public function compile(JsUtils $js = NULL, &$view = NULL) {
+	public function compile(JsUtils $js=NULL, &$view=NULL) {
 		$this->applyValue();
 		return parent::compile($js, $view);
 	}
@@ -423,19 +423,19 @@ 
 		return $this->input;
 	}
 
-	public function setIcon($icon = "dropdown") {
-		$this->content["arrow"] = new HtmlIcon($this->identifier . "-icon", $icon);
+	public function setIcon($icon="dropdown") {
+		$this->content["arrow"]=new HtmlIcon($this->identifier."-icon", $icon);
 		return $this;
 	}
 
-	public function jsAddItem($caption, $value = null) {
-		$value = $value ?? $caption;
-		$js = "var first=$('#{$this->identifier} .item').first();if(first!=undefined){var newItem =first.clone();first.parent().append(newItem);newItem.html({$caption});newItem.attr('data-value',{$value}).removeClass('active filtered');}";
+	public function jsAddItem($caption, $value=null) {
+		$value=$value ?? $caption;
+		$js="var first=$('#{$this->identifier} .item').first();if(first!=undefined){var newItem =first.clone();first.parent().append(newItem);newItem.html({$caption});newItem.attr('data-value',{$value}).removeClass('active filtered');}";
 		return $js;
 	}
 
 	public function setClearable($value) {
-		$this->_params["clearable"] = $value;
+		$this->_params["clearable"]=$value;
 	}
 
 	/**
@@ -443,7 +443,7 @@ 
 	 * Parameters addedValue, addedText, $addedChoice
 	 */
 	public function setOnAdd($jsCode) {
-		$this->_params["onAdd"] = $jsCode;
+		$this->_params["onAdd"]=$jsCode;
 		return $this;
 	}
 
@@ -452,7 +452,7 @@ 
 	 * Parameters removedValue, removedText, $removedChoice
 	 */
 	public function setOnRemove($jsCode) {
-		$this->_params["onRemove"] = $jsCode;
+		$this->_params["onRemove"]=$jsCode;
 		return $this;
 	}
 }

Ajax/common/traits/JsUtilsEventsTrait.php

Spacing +28 added lines, -28 removed lines

@@ -10,7 +10,7 @@ 
  */
 trait JsUtilsEventsTrait {
 
-	protected $jquery_events = array(
+	protected $jquery_events=array(
 		"bind",
 		"blur",
 		"change",
@@ -51,7 +51,7 @@ 
 		"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
@@ -62,7 +62,7 @@ 
 	 *        	code to execute
 	 * @return string
 	 */
-	public function blur($element = 'this', $js = '') {
+	public function blur($element='this', $js='') {
 		return $this->_add_event($element, $js, 'blur');
 	}
 
@@ -77,7 +77,7 @@ 
 	 * @param boolean $stopPropagation
 	 * @return string
 	 */
-	public function change($element = 'this', $js = '', $preventDefault = false, $stopPropagation = false) {
+	public function change($element='this', $js='', $preventDefault=false, $stopPropagation=false) {
 		return $this->_add_event($element, $js, 'change', $preventDefault, $stopPropagation);
 	}
 
@@ -94,15 +94,15 @@ 
 	 * @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);
@@ -117,7 +117,7 @@ 
 	 *        	code to execute
 	 * @return string
 	 */
-	public function contextmenu($element = 'this', $js = '') {
+	public function contextmenu($element='this', $js='') {
 		return $this->_add_event($element, $js, 'contextmenu');
 	}
 
@@ -130,7 +130,7 @@ 
 	 *        	code to execute
 	 * @return string
 	 */
-	public function dblclick($element = 'this', $js = '') {
+	public function dblclick($element='this', $js='') {
 		return $this->_add_event($element, $js, 'dblclick');
 	}
 
@@ -143,7 +143,7 @@ 
 	 *        	code to execute
 	 * @return string
 	 */
-	public function error($element = 'this', $js = '') {
+	public function error($element='this', $js='') {
 		return $this->_add_event($element, $js, 'error');
 	}
 
@@ -156,7 +156,7 @@ 
 	 *        	code to execute
 	 * @return string
 	 */
-	public function focus($element = 'this', $js = '') {
+	public function focus($element='this', $js='') {
 		return $this->_add_event($element, $js, 'focus');
 	}
 
@@ -170,9 +170,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;
 	}
 
@@ -185,7 +185,7 @@ 
 	 *        	code to execute
 	 * @return string
 	 */
-	public function keydown($element = 'this', $js = '') {
+	public function keydown($element='this', $js='') {
 		return $this->_add_event($element, $js, 'keydown');
 	}
 
@@ -198,7 +198,7 @@ 
 	 *        	code to execute
 	 * @return string
 	 */
-	public function keypress($element = 'this', $js = '') {
+	public function keypress($element='this', $js='') {
 		return $this->_add_event($element, $js, 'keypress');
 	}
 
@@ -211,7 +211,7 @@ 
 	 *        	code to execute
 	 * @return string
 	 */
-	public function keyup($element = 'this', $js = '') {
+	public function keyup($element='this', $js='') {
 		return $this->_add_event($element, $js, 'keyup');
 	}
 
@@ -224,7 +224,7 @@ 
 	 *        	code to execute
 	 * @return string
 	 */
-	public function load($element = 'this', $js = '') {
+	public function load($element='this', $js='') {
 		return $this->_add_event($element, $js, 'load');
 	}
 
@@ -237,7 +237,7 @@ 
 	 *        	code to execute
 	 * @return string
 	 */
-	public function mousedown($element = 'this', $js = '') {
+	public function mousedown($element='this', $js='') {
 		return $this->_add_event($element, $js, 'mousedown');
 	}
 
@@ -250,7 +250,7 @@ 
 	 *        	code to execute
 	 * @return string
 	 */
-	public function mouseout($element = 'this', $js = '', $preventDefault = false, $stopPropagation = false) {
+	public function mouseout($element='this', $js='', $preventDefault=false, $stopPropagation=false) {
 		return $this->_add_event($element, $js, 'mouseout', $preventDefault, $stopPropagation);
 	}
 
@@ -263,7 +263,7 @@ 
 	 *        	code to execute
 	 * @return string
 	 */
-	public function mouseleave($element = 'this', $js = '', $preventDefault = false, $stopPropagation = false) {
+	public function mouseleave($element='this', $js='', $preventDefault=false, $stopPropagation=false) {
 		return $this->_add_event($element, $js, 'mouseleave', $preventDefault, $stopPropagation);
 	}
 
@@ -276,7 +276,7 @@ 
 	 *        	code to execute
 	 * @return string
 	 */
-	public function mouseenter($element = 'this', $js = '', $preventDefault = false, $stopPropagation = false) {
+	public function mouseenter($element='this', $js='', $preventDefault=false, $stopPropagation=false) {
 		return $this->_add_event($element, $js, 'mouseenter', $preventDefault, $stopPropagation);
 	}
 
@@ -289,7 +289,7 @@ 
 	 *        	code to execute
 	 * @return string
 	 */
-	public function mouseover($element = 'this', $js = '') {
+	public function mouseover($element='this', $js='') {
 		return $this->_add_event($element, $js, 'mouseover');
 	}
 
@@ -302,7 +302,7 @@ 
 	 *        	code to execute
 	 * @return string
 	 */
-	public function mouseup($element = 'this', $js = '') {
+	public function mouseup($element='this', $js='') {
 		return $this->_add_event($element, $js, 'mouseup');
 	}
 
@@ -315,7 +315,7 @@ 
 	 *        	code to execute
 	 * @return string
 	 */
-	public function unload($element = 'this', $js = '') {
+	public function unload($element='this', $js='') {
 		return $this->_add_event($element, $js, 'unload');
 	}
 
@@ -329,7 +329,7 @@ 
 	 *        	code to execute
 	 * @return string
 	 */
-	public function resize($element = 'this', $js = '') {
+	public function resize($element='this', $js='') {
 		return $this->_add_event($element, $js, 'resize');
 	}
 
@@ -343,7 +343,7 @@ 
 	 *        	code to execute
 	 * @return string
 	 */
-	public function scroll($element = 'this', $js = '') {
+	public function scroll($element='this', $js='') {
 		return $this->_add_event($element, $js, 'scroll');
 	}
 }

Ajax/common/traits/JsUtilsActionsTrait.php

Spacing +138 added lines, -138 removed lines

@@ -11,7 +11,7 @@ 
  */
 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;
 	}
 
@@ -51,9 +51,9 @@ 
 			'normal',
 			'fast'
 		))) {
-			$speed = '"' . $speed . '"';
+			$speed='"'.$speed.'"';
 		} elseif (preg_match("/[^0-9]/", $speed)) {
-			$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);
+	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});";
+			$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,7 +109,7 @@ 
 	 *        	defers the execution if set to false
 	 * @return string
 	 */
-	public function addClass($element = 'this', $class = '', $immediatly = false) {
+	public function addClass($element='this', $class='', $immediatly=false) {
 		return $this->_genericCallValue('addClass', $element, $class, $immediatly);
 	}
 
@@ -122,7 +122,7 @@ 
 	 *        	defers the execution if set to false
 	 * @return string
 	 */
-	public function after($to, $element, $immediatly = false) {
+	public function after($to, $element, $immediatly=false) {
 		return $this->_genericCallElement('after', $to, $element, $immediatly);
 	}
 
@@ -135,7 +135,7 @@ 
 	 *        	defers the execution if set to false
 	 * @return string
 	 */
-	public function before($to, $element, $immediatly = false) {
+	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, $value = "", $immediatly = false) {
-		$element = Javascript::prep_element($element);
+	public function attr($element='this', $attributeName, $value="", $immediatly=false) {
+		$element=Javascript::prep_element($element);
 		if (isset($value)) {
-			$value = Javascript::prep_value($value);
-			$str = "$({$element}).attr(\"$attributeName\",{$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,7 +168,7 @@ 
 	 * @param boolean $immediatly
 	 *        	defers the execution if set to false
 	 */
-	public function val($element = 'this', $value = '', $immediatly = false) {
+	public function val($element='this', $value='', $immediatly=false) {
 		return $this->_genericCallValue('val', $element, $value, $immediatly);
 	}
 
@@ -180,7 +180,7 @@ 
 	 * @param boolean $immediatly
 	 *        	defers the execution if set to false
 	 */
-	public function html($element = 'this', $value = '', $immediatly = false) {
+	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";
+		$animations="\t\t\t";
 		if (\is_array($params)) {
 			foreach ($params as $param => $value) {
-				$animations .= $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,7 +233,7 @@ 
 	 *        	defers the execution if set to false
 	 * @return string
 	 */
-	public function append($to, $element, $immediatly = false) {
+	public function append($to, $element, $immediatly=false) {
 		return $this->_genericCallElement('append', $to, $element, $immediatly);
 	}
 
@@ -246,7 +246,7 @@ 
 	 *        	defers the execution if set to false
 	 * @return string
 	 */
-	public function prepend($to, $element, $immediatly = false) {
+	public function prepend($to, $element, $immediatly=false) {
 		return $this->_genericCallElement('prepend', $to, $element, $immediatly);
 	}
 
@@ -263,7 +263,7 @@ 
 	 *        	defers the execution if set to false
 	 * @return string
 	 */
-	public function fadeIn($element = 'this', $speed = '', $callback = '', $immediatly = false) {
+	public function fadeIn($element='this', $speed='', $callback='', $immediatly=false) {
 		return $this->_showHideWithEffect("fadeIn", $element, $speed, $callback, $immediatly);
 	}
 
@@ -280,7 +280,7 @@ 
 	 *        	defers the execution if set to false
 	 * @return string
 	 */
-	public function fadeOut($element = 'this', $speed = '', $callback = '', $immediatly = false) {
+	public function fadeOut($element='this', $speed='', $callback='', $immediatly=false) {
 		return $this->_showHideWithEffect("fadeOut", $element, $speed, $callback, $immediatly);
 	}
 
@@ -297,7 +297,7 @@ 
 	 *        	defers the execution if set to false
 	 * @return string
 	 */
-	public function slideUp($element = 'this', $speed = '', $callback = '', $immediatly = false) {
+	public function slideUp($element='this', $speed='', $callback='', $immediatly=false) {
 		return $this->_showHideWithEffect("slideUp", $element, $speed, $callback, $immediatly);
 	}
 
@@ -312,7 +312,7 @@ 
 	 *        	defers the execution if set to false
 	 * @return string
 	 */
-	public function removeClass($element = 'this', $class = '', $immediatly = false) {
+	public function removeClass($element='this', $class='', $immediatly=false) {
 		return $this->_genericCallValue('removeClass', $element, $class, $immediatly);
 	}
 
@@ -329,7 +329,7 @@ 
 	 *        	defers the execution if set to false
 	 * @return string
 	 */
-	public function slideDown($element = 'this', $speed = '', $callback = '', $immediatly = false) {
+	public function slideDown($element='this', $speed='', $callback='', $immediatly=false) {
 		return $this->_showHideWithEffect("slideDown", $element, $speed, $callback, $immediatly);
 	}
 
@@ -346,7 +346,7 @@ 
 	 *        	defers the execution if set to false
 	 * @return string
 	 */
-	public function slideToggle($element = 'this', $speed = '', $callback = '', $immediatly = false) {
+	public function slideToggle($element='this', $speed='', $callback='', $immediatly=false) {
 		return $this->_showHideWithEffect("slideToggle", $element, $speed, $callback, $immediatly);
 	}
 
@@ -363,7 +363,7 @@ 
 	 *        	defers the execution if set to false
 	 * @return string
 	 */
-	public function hide($element = 'this', $speed = '', $callback = '', $immediatly = false) {
+	public function hide($element='this', $speed='', $callback='', $immediatly=false) {
 		return $this->_showHideWithEffect("hide", $element, $speed, $callback, $immediatly);
 	}
 
@@ -380,7 +380,7 @@ 
 	 *        	defers the execution if set to false
 	 * @return string
 	 */
-	public function toggle($element = 'this', $speed = '', $callback = '', $immediatly = false) {
+	public function toggle($element='this', $speed='', $callback='', $immediatly=false) {
 		return $this->_showHideWithEffect("toggle", $element, $speed, $callback, $immediatly);
 	}
 
@@ -394,7 +394,7 @@ 
 	 *        	defers the execution if set to false
 	 * @return string
 	 */
-	public function toggleClass($element = 'this', $class = '', $immediatly = false) {
+	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,7 +428,7 @@ 
 	 *        	defers the execution if set to false
 	 * @return string
 	 */
-	public function show($element = 'this', $speed = '', $callback = '', $immediatly = false) {
+	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();
+	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[]="\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 . "}";
+	public function condition($condition, $jsCodeIfTrue, $jsCodeIfFalse=null, $immediatly=false) {
+		$str="if(".$condition."){".$jsCodeIfTrue."}";
 		if (isset($jsCodeIfFalse)) {
-			$str .= "else{" . $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,7 +521,7 @@ 
 	 *        	javascript code to execute after the jquery call
 	 * @return mixed
 	 */
-	public function doJQuery($element, $jqueryCall, $param = "", $jsCallback = "") {
+	public function doJQuery($element, $jqueryCall, $param="", $jsCallback="") {
 		return $this->_doJQuery($element, $jqueryCall, $param, $jsCallback, true);
 	}
 
@@ -538,7 +538,7 @@ 
 	 *        	javascript code to execute after the jquery call
 	 * @return mixed
 	 */
-	public function doJQueryDeferred($element, $jqueryCall, $param = "", $jsCallback = "") {
+	public function doJQueryDeferred($element, $jqueryCall, $param="", $jsCallback="") {
 		return $this->_doJQuery($element, $jqueryCall, $param, $jsCallback, false);
 	}
 
@@ -556,7 +556,7 @@ 
 	 * @param boolean $immediatly
 	 * @return string
 	 */
-	private function _doJQueryOn($event, $element, $elementToModify, $jqueryCall, $param = "", $preventDefault = false, $stopPropagation = false, $jsCallback = "", $immediatly = true) {
+	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,11 +571,11 @@ 
 	 * @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;
+	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;
+	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);
+		$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";
+	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);
 	}
 
@@ -645,13 +645,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;
+	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);
+		$script=$this->_add_event($element, Javascript::draggable($attr), "dragstart", $preventDefault, $stopPropagation, $immediatly);
 		return $script;
 	}
 
@@ -665,13 +665,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);
+	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);
+		$script.=$this->_add_event($element, Javascript::dropZone($jqueryDone, $jsCallback), "drop", true, $stopPropagation, $immediatly);
 		return $script;
 	}
 
@@ -688,14 +688,14 @@ 
 	 *        	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});";
+			$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);
 	}
@@ -709,7 +709,7 @@ 
 	 *        	delayed if false
 	 * @return string
 	 */
-	public function clearInterval($globalName, $immediatly = true) {
+	public function clearInterval($globalName, $immediatly=true) {
 		return $this->exec("if(window.{$globalName}){clearInterval(window.{$globalName});}", $immediatly);
 	}
 
@@ -731,20 +731,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 = "";
+		$global="";
 		if (isset($globalName)) {
-			$global = "\nwindow.{$globalName}=interval;";
+			$global="\nwindow.{$globalName}=interval;";
 		}
-		$timer = "var startTimer=function(duration, display) {var timer = duration, minutes, seconds;
+		$timer="var startTimer=function(duration, display) {var timer = duration, minutes, seconds;
 											display.trigger('counter-start',timer);
 											display.show();
     										var interval=setInterval(function () {
@@ -752,12 +752,12 @@ 
 										        minutes = minutes < 10 ? '0' + minutes : minutes;
         										seconds = seconds < 10 ? '0' + seconds : seconds;
 										        if(display.is('[value]')){display.val(minutes + ':' + seconds);} else {display.html(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);
 	}
 
 	/**
@@ -779,7 +779,7 @@ 
 	 *        	count down if true or elapse if false
 	 * @return string
 	 */
-	public function counterOn($element, $event, $counterSelector, $value = 0, $limit = 0, $globalName = null, $countDown = true) {
+	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));
 	}
 
@@ -794,7 +794,7 @@ 
 	 *        	the active href (if null, window.location.href is used)
 	 * @return string
 	 */
-	public function activateLink($target, $property = 'href', $href = null) {
+	public function activateLink($target, $property='href', $href=null) {
 		return $this->execAtLast($this->_activateLink($target, $property, $href));
 	}
 
@@ -809,14 +809,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");';
+	public function _activateLink($target, $property='href', $href=null) {
+		$js='$("'.$target.' ['.$property.']").removeClass("active");';
 		if (isset($href)) {
-			$js .= 'var href="' . $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;
 	}
 }

Ajax/semantic/components/Dimmer.php

Spacing +5 added lines, -5 removed lines

@@ -7,18 +7,18 @@
 
 	public function __construct(JsUtils $js) {
 		parent::__construct($js);
-		$this->uiName = "dimmer";
+		$this->uiName="dimmer";
 	}
 
-	public function setOn($value = false) {
-		$this->params["on"] = $value;
+	public function setOn($value=false) {
+		$this->params["on"]=$value;
 	}
 
 	public function setOpacity($value) {
-		$this->params["opacity"] = $value;
+		$this->params["opacity"]=$value;
 	}
 
 	public function setClosable($value) {
-		$this->params["closable"] = $value;
+		$this->params["closable"]=$value;
 	}
 }

Ajax/semantic/html/modules/HtmlDimmer.php

Spacing +14 added lines, -14 removed lines

@@ -12,21 +12,21 @@ 
 
 	private $_inverted;
 
-	public function __construct($identifier, $content = NULL) {
+	public function __construct($identifier, $content=NULL) {
 		parent::__construct($identifier, "div", "ui dimmer");
 		$this->setContent($content);
-		$this->_inverted = false;
+		$this->_inverted=false;
 	}
 
 	public function setContent($content) {
-		$this->content = new HtmlSemDoubleElement("content-" . $this->identifier, "div", "content", new HtmlSemDoubleElement("", "div", "center", $content));
+		$this->content=new HtmlSemDoubleElement("content-".$this->identifier, "div", "content", new HtmlSemDoubleElement("", "div", "center", $content));
 		return $this;
 	}
 
-	public function asIcon($icon, $title, $subHeader = NULL) {
-		$header = new HtmlHeader("header-" . $this->identifier);
+	public function asIcon($icon, $title, $subHeader=NULL) {
+		$header=new HtmlHeader("header-".$this->identifier);
 		$header->asIcon($icon, $title, $subHeader);
-		if ($this->_inverted === false)
+		if ($this->_inverted===false)
 			$header->setInverted();
 		return $this->setContent($header);
 	}
@@ -35,24 +35,24 @@ 
 		return $this->addToProperty("class", "page");
 	}
 
-	public function setInverted($recursive = true) {
+	public function setInverted($recursive=true) {
 		parent::setInverted($recursive);
-		$this->_inverted = true;
+		$this->_inverted=true;
 		return $this;
 	}
 
 	public function run(JsUtils $js) {
 		if ($this->_container instanceof HtmlSingleElement) {
-			$this->_bsComponent = $js->semantic()->dimmer("#" . $this->_container->getIdentifier(), $this->_params);
+			$this->_bsComponent=$js->semantic()->dimmer("#".$this->_container->getIdentifier(), $this->_params);
 		} else {
-			$this->_bsComponent = $js->semantic()->dimmer("#" . $this->identifier, $this->_params);
+			$this->_bsComponent=$js->semantic()->dimmer("#".$this->identifier, $this->_params);
 		}
 		return parent::run($js);
 	}
 
 	public function jsShow() {
 		if (isset($this->_container))
-			return '$("#.' . $this->_container->getIdentifier() . ').dimmer("show");';
+			return '$("#.'.$this->_container->getIdentifier().').dimmer("show");';
 	}
 
 	public function setBlurring() {
@@ -60,17 +60,17 @@ 
 	}
 
 	public function setParams($_params) {
-		$this->_params = $_params;
+		$this->_params=$_params;
 		return $this;
 	}
 
 	public function setContainer($_container) {
-		$this->_container = $_container;
+		$this->_container=$_container;
 		return $this;
 	}
 
 	public function setClosable($closable) {
-		$this->_params['closable'] = $closable;
+		$this->_params['closable']=$closable;
 		return $this;
 	}
 }