phpMv / phpMv-UI

Ajax/semantic/html/collections/form/HtmlForm.php

Spacing +30 added lines, -30 removed lines

@@ -23,7 +23,7 @@ 
  */
 class HtmlForm extends HtmlSemCollection {
 
-	use FieldsTrait,FormTrait;
+	use FieldsTrait, FormTrait;
 	/**
 	 * @var array
 	 */
@@ -38,15 +38,15 @@ 
 
 	public function __construct($identifier, $elements=array()) {
 		parent::__construct($identifier, "form", "ui form");
-		$this->_states=[ State::ERROR,State::SUCCESS,State::WARNING,State::DISABLED ];
+		$this->_states=[State::ERROR, State::SUCCESS, State::WARNING, State::DISABLED];
 		$this->setProperty("name", $this->identifier);
-		$this->_fields=array ();
+		$this->_fields=array();
 		$this->addItems($elements);
 		$this->_validationParams=[];
 		$this->_extraFieldRules=[];
 	}
 
-	protected function getForm(){
+	protected function getForm() {
 		return $this;
 	}
 
@@ -68,8 +68,8 @@ 
 	 * @param string $caption
 	 * @return HtmlForm
 	 */
-	public function addDivider($caption=NULL){
-		return $this->addContent(new HtmlDivider("",$caption));
+	public function addDivider($caption=NULL) {
+		return $this->addContent(new HtmlDivider("", $caption));
 	}
 
 	/**
@@ -91,13 +91,13 @@ 
 						$label=NULL;
 				}
 				$this->_fields=\array_merge($this->_fields, $fields);
-				$fields=new HtmlFormFields("fields-" . $this->identifier . "-" . $this->count(), $fields);
+				$fields=new HtmlFormFields("fields-".$this->identifier."-".$this->count(), $fields);
 			}
-			if (isset($label)){
-				$fields->wrap("<div class='field'><label>{$label}</label>","</div>");
+			if (isset($label)) {
+				$fields->wrap("<div class='field'><label>{$label}</label>", "</div>");
 			}
 		} else {
-			$fields=new HtmlFormFields("fields-" . $this->identifier . "-" . $this->count());
+			$fields=new HtmlFormFields("fields-".$this->identifier."-".$this->count());
 		}
 		$this->addItem($fields);
 		return $fields;
@@ -105,7 +105,7 @@ 
 
 	public function addItem($item) {
 		$item=parent::addItem($item);
-		if (\is_subclass_of($item, HtmlFormField::class) === true) {
+		if (\is_subclass_of($item, HtmlFormField::class)===true) {
 			$this->_fields[]=$item;
 		}
 		return $item;
@@ -163,49 +163,49 @@ 
 
 
 
-	public function compile(JsUtils $js=NULL,&$view=NULL){
-		if(\sizeof($this->_validationParams)>0)
+	public function compile(JsUtils $js=NULL, &$view=NULL) {
+		if (\sizeof($this->_validationParams)>0)
 			$this->setProperty("novalidate", "");
-		return parent::compile($js,$view);
+		return parent::compile($js, $view);
 	}
 
 	public function run(JsUtils $js) {
-		if(isset($js)){
+		if (isset($js)) {
 			$compo=$js->semantic()->form("#".$this->identifier);
-		}else{
+		} else {
 			$compo=new Form();
 			$compo->attach("#".$this->identifier);
 		}
-		foreach ($this->_fields as $field){
-			if($field instanceof HtmlFormField){
+		foreach ($this->_fields as $field) {
+			if ($field instanceof HtmlFormField) {
 				$this->addCompoValidation($compo, $field);
 			}
 		}
-		foreach ($this->content as $field){
-			if($field instanceof HtmlFormFields){
+		foreach ($this->content as $field) {
+			if ($field instanceof HtmlFormFields) {
 				$items=$field->getItems();
-				foreach ($items as $_field){
-					if($_field instanceof HtmlFormField)
+				foreach ($items as $_field) {
+					if ($_field instanceof HtmlFormField)
 						$this->addCompoValidation($compo, $_field);
 				}
 			}
 		}
-		foreach ($this->_extraFieldRules as $field=>$fieldValidation){
+		foreach ($this->_extraFieldRules as $field=>$fieldValidation) {
 			$this->addExtraCompoValidation($compo, $fieldValidation);
 		}
-		$this->_runValidationParams($compo,$js);
+		$this->_runValidationParams($compo, $js);
 		return $this->_bsComponent;
 	}
 	
-	public function getExtraFieldValidation($fieldname){
-		if(!isset($this->_extraFieldRules[$fieldname])){
+	public function getExtraFieldValidation($fieldname) {
+		if (!isset($this->_extraFieldRules[$fieldname])) {
 			$this->_extraFieldRules[$fieldname]=new FieldValidation($fieldname);
 		}
 		return $this->_extraFieldRules[$fieldname];
 	}
 
-	public function addValidationParam($paramName,$paramValue,$before="",$after=""){
-		$this->addBehavior($this->_validationParams, $paramName, $paramValue,$before,$after);
+	public function addValidationParam($paramName, $paramValue, $before="", $after="") {
+		$this->addBehavior($this->_validationParams, $paramName, $paramValue, $before, $after);
 		return $this;
 	}
 
@@ -214,7 +214,7 @@ 
 		return $this;
 	}
 	
-	public function hasValidationParams(){
+	public function hasValidationParams() {
 		return sizeof($this->_validationParams)>0;
 	}
 
@@ -222,7 +222,7 @@ 
 		return $this->_validationParams;
 	}
 
-	public function removeValidationParam($param){
+	public function removeValidationParam($param) {
 		unset($this->_validationParams[$param]);
 		return $this;
 	}

Braces +22 added lines, -15 removed lines

@@ -58,8 +58,9 @@ 
 	 */
 	public function addHeader($title, $niveau=1, $dividing=true) {
 		$header=new HtmlHeader("", $niveau, $title);
-		if ($dividing)
-			$header->setDividing();
+		if ($dividing) {
+					$header->setDividing();
+		}
 		return $this->addItem($header);
 	}
 
@@ -87,8 +88,9 @@ 
 					if (\is_string($end)) {
 						$label=$end;
 						\array_pop($fields);
-					} else
-						$label=NULL;
+					} else {
+											$label=NULL;
+					}
 				}
 				$this->_fields=\array_merge($this->_fields, $fields);
 				$fields=new HtmlFormFields("fields-" . $this->identifier . "-" . $this->count(), $fields);
@@ -152,27 +154,31 @@ 
 	 */
 	public function addMessage($identifier, $content, $header=NULL, $icon=NULL, $type=NULL) {
 		$message=new HtmlMessage($identifier, $content);
-		if (isset($header))
-			$message->addHeader($header);
-		if (isset($icon))
-			$message->setIcon($icon);
-		if (isset($type))
-			$message->setStyle($type);
+		if (isset($header)) {
+					$message->addHeader($header);
+		}
+		if (isset($icon)) {
+					$message->setIcon($icon);
+		}
+		if (isset($type)) {
+					$message->setStyle($type);
+		}
 		return $this->addItem($message);
 	}
 
 
 
 	public function compile(JsUtils $js=NULL,&$view=NULL){
-		if(\sizeof($this->_validationParams)>0)
-			$this->setProperty("novalidate", "");
+		if(\sizeof($this->_validationParams)>0) {
+					$this->setProperty("novalidate", "");
+		}
 		return parent::compile($js,$view);
 	}
 
 	public function run(JsUtils $js) {
 		if(isset($js)){
 			$compo=$js->semantic()->form("#".$this->identifier);
-		}else{
+		} else{
 			$compo=new Form();
 			$compo->attach("#".$this->identifier);
 		}
@@ -185,8 +191,9 @@ 
 			if($field instanceof HtmlFormFields){
 				$items=$field->getItems();
 				foreach ($items as $_field){
-					if($_field instanceof HtmlFormField)
-						$this->addCompoValidation($compo, $_field);
+					if($_field instanceof HtmlFormField) {
+											$this->addCompoValidation($compo, $_field);
+					}
 				}
 			}
 		}

Ajax/semantic/html/modules/HtmlTab.php

Spacing +45 added lines, -45 removed lines

@@ -15,15 +15,15 @@ 
  * @author jc
  * @version 1.02
  */
-class HtmlTab extends HtmlSemCollection{
+class HtmlTab extends HtmlSemCollection {
 
 	protected $params=[];
 	protected $_activated=false;
 
-	public function __construct( $identifier, $tabs=array()){
-		parent::__construct( $identifier, "div", "");
+	public function __construct($identifier, $tabs=array()) {
+		parent::__construct($identifier, "div", "");
 		$menu=new HtmlMenu("menu".$this->identifier);
-		$menu->asTab(false)->setAttachment(NULL,Side::TOP);
+		$menu->asTab(false)->setAttachment(NULL, Side::TOP);
 		$this->content["menu"]=$menu;
 		$this->addItems($tabs);
 	}
@@ -33,12 +33,12 @@ 
 	 * @see \Ajax\common\html\HtmlCollection::createItem()
 	 * @return HtmlSegment
 	 */
-	protected function createItem($value){
+	protected function createItem($value) {
 		$count=$this->count();
 		$title=$value;
 		$content=NULL;
-		if(\is_array($value)){
-			$title=@$value[0];$content=@$value[1];
+		if (\is_array($value)) {
+			$title=@$value[0]; $content=@$value[1];
 		}
 		$menuItem=$this->content["menu"]->addItem($title);
 		$menuItem->addToProperty("data-tab", $menuItem->getIdentifier());
@@ -54,9 +54,9 @@ 
 	 * @param string $datatab
 	 * @return \Ajax\semantic\html\elements\HtmlSegment
 	 */
-	private function createSegment($count,$content,$datatab){
+	private function createSegment($count, $content, $datatab) {
 		$segment=new HtmlSegment("item-".$this->identifier."-".$count, $content);
-		$segment->setAttachment(NULL,Side::BOTTOM)->addToProperty("class", "tab")->addToProperty("data-tab",$datatab);
+		$segment->setAttachment(NULL, Side::BOTTOM)->addToProperty("class", "tab")->addToProperty("data-tab", $datatab);
 		return $segment;
 	}
 
@@ -66,12 +66,12 @@ 
 	 * @param String $content new content
 	 * @return \Ajax\semantic\html\modules\HtmlTab
 	 */
-	public function setTabContent($index,$content){
+	public function setTabContent($index, $content) {
 		$menu=$this->content["menu"];
-		if($index<$menu->count()){
-			if(isset($this->content[$index])===false){
+		if ($index<$menu->count()) {
+			if (isset($this->content[$index])===false) {
 				$this->content[$index]=$this->createSegment($index, $content, $menu->getItem($index)->getIdentifier());
-			}else
+			} else
 				$this->content[$index]->setContent($content);
 		}
 		return $this;
@@ -82,9 +82,9 @@ 
 	 * @param array $contents
 	 * @return \Ajax\semantic\html\modules\HtmlTab
 	 */
-	public function setTabsContent($contents){
+	public function setTabsContent($contents) {
 		$size=\sizeof($contents);
-		for($i=0;$i<$size;$i++){
+		for ($i=0; $i<$size; $i++) {
 			$this->setTabContent($i, $contents[$i]);
 		}
 		return $this;
@@ -95,7 +95,7 @@ 
 	 * @param int $index
 	 * @return \Ajax\semantic\html\modules\HtmlTab
 	 */
-	public function activate($index){
+	public function activate($index) {
 		$this->content["menu"]->getItem($index)->setActive(true);
 		$this->content[$index]->setActive(true);
 		$this->_activated=true;
@@ -108,8 +108,8 @@ 
 	 * @param string $content
 	 * @return \Ajax\semantic\html\elements\HtmlSegment
 	 */
-	public function addTab($title,$content){
-		return $this->addItem([$title,$content]);
+	public function addTab($title, $content) {
+		return $this->addItem([$title, $content]);
 	}
 
 	/**
@@ -123,13 +123,13 @@ 
 	 * @param array $params
 	 * @return \Ajax\semantic\html\elements\HtmlSegment
 	 */
-	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);
+	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);
 			return $this->content[$index];
 		}
 
-		return $this->addAndForwardTab($js, $title, $initialController, $controller, $action,$params);
+		return $this->addAndForwardTab($js, $title, $initialController, $controller, $action, $params);
 	}
 
 	/**
@@ -142,12 +142,12 @@ 
 	 * @param array $params The parameters to pass to the view
 	 * @return \Ajax\semantic\html\elements\HtmlSegment
 	 */
-	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);
+	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);
 			return $this->content[$index];
 		}
-		return $this->addAndRenderViewTab($js, $title, $initialController, $viewName,$params);
+		return $this->addAndRenderViewTab($js, $title, $initialController, $viewName, $params);
 	}
 
 
@@ -161,11 +161,11 @@ 
 	 * @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);
+		$js->forward($initialController, $controller, $action, $params);
 		$content=\ob_get_clean();
-		return $this->addTab($title,$content);
+		return $this->addTab($title, $content);
 	}
 
 	/**
@@ -177,8 +177,8 @@ 
 	 * @param array $params The parameters to pass to the view
 	 * @return \Ajax\semantic\html\elements\HtmlSegment
 	 */
-	public function addAndRenderViewTab(JsUtils $js,$title,$initialController, $viewName, $params=array()) {
-		return $this->addTab($title, $js->renderContent($initialController, $viewName,$params));
+	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) {
@@ -194,7 +194,7 @@ 
 	 * @param int $index
 	 * @return HtmlMenuItem
 	 */
-	public function getMenuTab($index){
+	public function getMenuTab($index) {
 		return $this->content["menu"]->getItem($index);
 	}
 
@@ -203,7 +203,7 @@ 
 	 * @param int $index
 	 * @return HtmlSegment
 	 */
-	public function getTab($index){
+	public function getTab($index) {
 		return $this->content[$index];
 	}
 
@@ -212,22 +212,22 @@ 
 	 * @param HtmlMenu $menu
 	 * @return \Ajax\semantic\html\modules\HtmlTab
 	 */
-	public function setMenu($menu){
+	public function setMenu($menu) {
 		$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"));
+		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++){
+		for ($i=0; $i<$menuSize; $i++) {
 			$menu->getItem($i)->removeProperty("href");
-			if(isset($this->content[$i])===false){
+			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"));
+			$menu->getItem($i)->addToProperty("data-tab", $this->content[$i]->getProperty("data-tab"));
 		}
 
 		$this->content["menu"]=$menu;
@@ -239,15 +239,15 @@ 
 	 * @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)
+		if (!$this->_activated && $this->content["menu"]->count()>0 && \sizeof($this->content)>1)
 			$this->activate(0);
-		return parent::compile($js,$view);
+		return parent::compile($js, $view);
 	}
 }

Braces +9 added lines, -6 removed lines

@@ -71,8 +71,9 @@ 
 		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);
+			} else {
+							$this->content[$index]->setContent($content);
+			}
 		}
 		return $this;
 	}
@@ -239,15 +240,17 @@ 
 	 * @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)
-			$this->activate(0);
+		if(!$this->_activated && $this->content["menu"]->count()>0 && \sizeof($this->content)>1) {
+					$this->activate(0);
+		}
 		return parent::compile($js,$view);
 	}
 }

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

Braces +23 added lines, -16 removed lines

@@ -59,8 +59,9 @@ 
 		$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;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[] = $retour;
+		}
 		return $retour;
 	}
 
@@ -114,8 +115,9 @@ 
 				$retour .= "url=url+'" . $slash . "'+$(this).html();\n";
 			} elseif (\substr($attr, 0, 3) === "js:") {
 				$retour .= "url=url+'" . $slash . "'+" . \substr($attr, 3) . ";\n";
-			} elseif ($attr !== null && $attr !== "")
-				$retour .= "url=url+'" . $slash . "'+($(this).attr('" . $attr . "')||'');\n";
+			} elseif ($attr !== null && $attr !== "") {
+							$retour .= "url=url+'" . $slash . "'+($(this).attr('" . $attr . "')||'');\n";
+			}
 		}
 		return $retour;
 	}
@@ -139,10 +141,11 @@ 
 			} elseif (isset($this->ajaxTransition)) {
 				$call = $this->ajaxTransition;
 			}
-			if (\is_callable($call))
-				$retour = "\t" . $call($responseElement, $jqueryDone) . ";\n";
-			else
-				$retour = "\t{$responseElement}.{$jqueryDone}( data );\n";
+			if (\is_callable($call)) {
+							$retour = "\t" . $call($responseElement, $jqueryDone) . ";\n";
+			} else {
+							$retour = "\t{$responseElement}.{$jqueryDone}( data );\n";
+			}
 		}
 		if (isset($history)) {
 			if ($this->params["autoActiveLinks"]) {
@@ -165,8 +168,9 @@ 
 	}
 
 	protected function _correctAjaxUrl($url) {
-		if ($url !== "/" && JString::endsWith($url, "/") === true)
-			$url = substr($url, 0, strlen($url) - 1);
+		if ($url !== "/" && JString::endsWith($url, "/") === true) {
+					$url = substr($url, 0, strlen($url) - 1);
+		}
 		if (strncmp($url, 'http://', 7) != 0 && strncmp($url, 'https://', 8) != 0) {
 			$url = $this->getUrl($url);
 		}
@@ -190,8 +194,9 @@ 
 	public static function _implodeParams($parameters) {
 		$allParameters = [];
 		foreach ($parameters as $params) {
-			if (isset($params))
-				$allParameters[] = self::_correctParams($params);
+			if (isset($params)) {
+							$allParameters[] = self::_correctParams($params);
+			}
 		}
 		return \implode("+'&'+", $allParameters);
 	}
@@ -217,8 +222,9 @@ 
 
 	protected function setDefaultParameters(&$parameters, $default) {
 		foreach ($default as $k => $v) {
-			if (! isset($parameters[$k]))
-				$parameters[$k] = $v;
+			if (! isset($parameters[$k])) {
+							$parameters[$k] = $v;
+			}
 		}
 	}
 
@@ -746,8 +752,9 @@ 
 			$retour .= "$('#" . $form . "').submit();\n";
 		}
 		$retour = $this->_addJsCondition($jsCondition, $retour);
-		if ($immediatly)
-			$this->jquery_code_for_compile[] = $retour;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[] = $retour;
+		}
 		return $retour;
 	}
 

Ajax/common/traits/JsUtilsActionsTrait.php

Braces +36 added lines, -24 removed lines

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

Spacing +134 added lines, -134 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,10 +645,10 @@ 
 	 * @param array $parameters
 	 *        	default : array("attr"=>"id","preventDefault"=>false,"stopPropagation"=>false,"immediatly"=>true)
 	 */
-	public function setDraggable($element, $parameters = []) {
-		$attr = "id";
+	public function setDraggable($element, $parameters=[]) {
+		$attr="id";
 		extract($parameters);
-		$script = $this->_add_event($element, Javascript::draggable($attr), "dragstart", $parameters);
+		$script=$this->_add_event($element, Javascript::draggable($attr), "dragstart", $parameters);
 		return $script;
 	}
 
@@ -662,13 +662,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;
 	}
 
@@ -685,14 +685,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);
 	}
@@ -706,7 +706,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);
 	}
 
@@ -728,20 +728,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 () {
@@ -749,12 +749,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);
 	}
 
 	/**
@@ -776,7 +776,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));
 	}
 
@@ -791,14 +791,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 $this->execAtLast($js);
 	}
 }