phpMv / phpMv-UI

Ajax/semantic/traits/SemanticHtmlElementsTrait.php

Spacing +16 added lines, -16 removed lines

@@ -45,7 +45,7 @@ 
 	 * @param string $onClick
 	 * @return HtmlButton
 	 */
-	public function htmlButton($identifier, $value = null, $cssStyle = null, $onClick = null) {
+	public function htmlButton($identifier, $value=null, $cssStyle=null, $onClick=null) {
 		return $this->addHtmlComponent(new HtmlButton($identifier, $value, $cssStyle, $onClick));
 	}
 
@@ -59,7 +59,7 @@ 
 	 * @param boolean $asIcons
 	 * @return HtmlButtonGroups
 	 */
-	public function htmlButtonGroups($identifier, $elements = array(), $asIcons = false) {
+	public function htmlButtonGroups($identifier, $elements=array(), $asIcons=false) {
 		return $this->addHtmlComponent(new HtmlButtonGroups($identifier, $elements, $asIcons));
 	}
 
@@ -72,7 +72,7 @@ 
 	 * @param string $content
 	 * @return HtmlContainer
 	 */
-	public function htmlContainer($identifier, $content = "") {
+	public function htmlContainer($identifier, $content="") {
 		return $this->addHtmlComponent(new HtmlContainer($identifier, $content));
 	}
 
@@ -85,7 +85,7 @@ 
 	 * @param string $content
 	 * @return HtmlDivider
 	 */
-	public function htmlDivider($identifier, $content = "", $tagName = "div") {
+	public function htmlDivider($identifier, $content="", $tagName="div") {
 		return $this->addHtmlComponent(new HtmlDivider($identifier, $content, $tagName));
 	}
 
@@ -100,7 +100,7 @@ 
 	 * @param string $type
 	 * @return HtmlHeader
 	 */
-	public function htmlHeader($identifier, $niveau = 1, $content = NULL, $type = "page") {
+	public function htmlHeader($identifier, $niveau=1, $content=NULL, $type="page") {
 		return $this->addHtmlComponent(new HtmlHeader($identifier, $niveau, $content, $type));
 	}
 
@@ -128,7 +128,7 @@ 
 	 * @param string $size
 	 * @return HtmlImage
 	 */
-	public function htmlImage($identifier, $src = "", $alt = "", $size = NULL) {
+	public function htmlImage($identifier, $src="", $alt="", $size=NULL) {
 		return $this->addHtmlComponent(new HtmlImage($identifier, $src, $alt, $size));
 	}
 
@@ -142,7 +142,7 @@ 
 	 * @param string $size
 	 * @return HtmlIconGroups
 	 */
-	public function htmlIconGroups($identifier, $icons = array(), $size = "") {
+	public function htmlIconGroups($identifier, $icons=array(), $size="") {
 		return $this->addHtmlComponent(new HtmlIconGroups($identifier, $icons, $size));
 	}
 
@@ -157,7 +157,7 @@ 
 	 * @param string $placeholder
 	 * @return HtmlInput
 	 */
-	public function htmlInput($identifier, $type = "text", $value = "", $placeholder = "") {
+	public function htmlInput($identifier, $type="text", $value="", $placeholder="") {
 		return $this->addHtmlComponent(new HtmlInput($identifier, $type, $value, $placeholder));
 	}
 
@@ -171,7 +171,7 @@ 
 	 * @param string $tagName
 	 * @return HtmlLabel
 	 */
-	public function htmlLabel($identifier, $content = "", $icon = NULL, $tagName = "div") {
+	public function htmlLabel($identifier, $content="", $icon=NULL, $tagName="div") {
 		return $this->addHtmlComponent(new HtmlLabel($identifier, $content, $icon, $tagName));
 	}
 
@@ -182,7 +182,7 @@ 
 	 * @param array $attributes
 	 * @return HtmlLabelGroups
 	 */
-	public function htmlLabelGroups($identifier, $labels = array(), $attributes = array()) {
+	public function htmlLabelGroups($identifier, $labels=array(), $attributes=array()) {
 		return $this->addHtmlComponent(new HtmlLabelGroups($identifier, $labels, $attributes));
 	}
 
@@ -193,7 +193,7 @@ 
 	 * @param array $items
 	 * @return HtmlList
 	 */
-	public function htmlList($identifier, $items = array()) {
+	public function htmlList($identifier, $items=array()) {
 		return $this->addHtmlComponent(new HtmlList($identifier, $items));
 	}
 
@@ -204,7 +204,7 @@ 
 	 * @param string $content
 	 * @return HtmlSegment
 	 */
-	public function htmlSegment($identifier, $content = "") {
+	public function htmlSegment($identifier, $content="") {
 		return $this->addHtmlComponent(new HtmlSegment($identifier, $content));
 	}
 
@@ -216,7 +216,7 @@ 
 	 *        	the segments
 	 * @return HtmlSegmentGroups
 	 */
-	public function htmlSegmentGroups($identifier, $items = array()) {
+	public function htmlSegmentGroups($identifier, $items=array()) {
 		return $this->addHtmlComponent(new HtmlSegmentGroups($identifier, $items));
 	}
 
@@ -230,7 +230,7 @@ 
 	 * @param Direction|string $attributeType
 	 * @return HtmlReveal
 	 */
-	public function htmlReveal($identifier, $visibleContent, $hiddenContent, $type = RevealType::FADE, $attributeType = NULL) {
+	public function htmlReveal($identifier, $visibleContent, $hiddenContent, $type=RevealType::FADE, $attributeType=NULL) {
 		return $this->addHtmlComponent(new HtmlReveal($identifier, $visibleContent, $hiddenContent, $type, $attributeType));
 	}
 
@@ -241,7 +241,7 @@ 
 	 * @param array $steps
 	 * @return HtmlStep
 	 */
-	public function htmlStep($identifier, $steps = array()) {
+	public function htmlStep($identifier, $steps=array()) {
 		return $this->addHtmlComponent(new HtmlStep($identifier, $steps));
 	}
 
@@ -275,7 +275,7 @@ 
 	 * @param mixed $content
 	 * @return HtmlRail
 	 */
-	public function htmlRail($identifier, $content = null) {
+	public function htmlRail($identifier, $content=null) {
 		return $this->addHtmlComponent(new HtmlRail($identifier, $content));
 	}
 }

Ajax/common/html/HtmlDoubleElement.php

Spacing +36 added lines, -36 removed lines

@@ -13,19 +13,19 @@ 
 	 */
 	protected $content;
 
-	protected $wrapContentBefore = "";
+	protected $wrapContentBefore="";
 
-	protected $wrapContentAfter = "";
+	protected $wrapContentAfter="";
 
 	protected $_editableContent;
 
-	public function __construct($identifier, $tagName = "p") {
+	public function __construct($identifier, $tagName="p") {
 		parent::__construct($identifier, $tagName);
-		$this->_template = '<%tagName% id="%identifier%" %properties%>%wrapContentBefore%%content%%wrapContentAfter%</%tagName%>';
+		$this->_template='<%tagName% id="%identifier%" %properties%>%wrapContentBefore%%content%%wrapContentAfter%</%tagName%>';
 	}
 
 	public function setContent($content) {
-		$this->content = $content;
+		$this->content=$content;
 		return $this;
 	}
 
@@ -33,19 +33,19 @@ 
 		return $this->content;
 	}
 
-	public function addContent($content, $before = false) {
-		if (! \is_array($this->content)) {
+	public function addContent($content, $before=false) {
+		if (!\is_array($this->content)) {
 			if (isset($this->content))
-				$this->content = array(
+				$this->content=array(
 					$this->content
 				);
 			else
-				$this->content = array();
+				$this->content=array();
 		}
 		if ($before)
 			\array_unshift($this->content, $content);
 		else
-			$this->content[] = $content;
+			$this->content[]=$content;
 		return $this;
 	}
 
@@ -68,9 +68,9 @@ 
 
 	public function setValue($value) {}
 
-	public function wrapContent($before, $after = "") {
-		$this->wrapContentBefore .= $before;
-		$this->wrapContentAfter = $after . $this->wrapContentAfter;
+	public function wrapContent($before, $after="") {
+		$this->wrapContentBefore.=$before;
+		$this->wrapContentAfter=$after.$this->wrapContentAfter;
 		return $this;
 	}
 
@@ -89,14 +89,14 @@ 
 	}
 
 	protected function _getContentInstances($class, $content) {
-		$instances = [];
+		$instances=[];
 		if ($content instanceof $class) {
-			$instances[] = $content;
+			$instances[]=$content;
 		} elseif ($content instanceof HtmlDoubleElement) {
-			$instances = \array_merge($instances, $content->getContentInstances($class));
+			$instances=\array_merge($instances, $content->getContentInstances($class));
 		} elseif (\is_array($content)) {
 			foreach ($content as $element) {
-				$instances = \array_merge($instances, $this->_getContentInstances($class, $element));
+				$instances=\array_merge($instances, $this->_getContentInstances($class, $element));
 			}
 		}
 		return $instances;
@@ -107,7 +107,7 @@ 
 	 *
 	 * @return HtmlDoubleElement
 	 */
-	public function asLink($href = NULL, $target = NULL) {
+	public function asLink($href=NULL, $target=NULL) {
 		if (isset($href))
 			$this->setProperty("href", $href);
 		if (isset($target))
@@ -122,28 +122,28 @@ 
 		return \strip_tags($this->content);
 	}
 
-	public function asEditable(HtmlFormField $field, $asForm = false, $setValueProperty = "val()") {
-		$idF = $field->getIdentifier();
-		$idE = $idF;
+	public function asEditable(HtmlFormField $field, $asForm=false, $setValueProperty="val()") {
+		$idF=$field->getIdentifier();
+		$idE=$idF;
 		if ($asForm) {
-			$frm = new HtmlForm("frm-" . $field->getIdentifier());
+			$frm=new HtmlForm("frm-".$field->getIdentifier());
 			$frm->setProperty("onsubmit", "return false;");
-			$fields = $frm->addFields();
-			$idE = $frm->getIdentifier();
+			$fields=$frm->addFields();
+			$idE=$frm->getIdentifier();
 			$fields->addItem($field);
-			$fields->addButtonIcon("bt-okay", "check", "green mini", "\$('#" . $idE . "').trigger('validate',{value: $('#'+idF+' input').val()});");
-			$fields->addButtonIcon("bt-cancel", "close", "mini", "\$('#" . $idE . "').trigger('endEdit');");
-			$this->_editableContent = $frm;
-			$keypress = "";
-			$focusOut = "";
+			$fields->addButtonIcon("bt-okay", "check", "green mini", "\$('#".$idE."').trigger('validate',{value: $('#'+idF+' input').val()});");
+			$fields->addButtonIcon("bt-cancel", "close", "mini", "\$('#".$idE."').trigger('endEdit');");
+			$this->_editableContent=$frm;
+			$keypress="";
+			$focusOut="";
 		} else {
-			$focusOut = "if(e.relatedTarget==null)elm.trigger('endEdit');";
-			$this->_editableContent = $field;
-			$keypress = "$('#" . $idF . "').keyup(function(e){if(e.which == 13) {\$('#" . $idE . "').trigger('validate',{value: $('#'+idF+' input').val()});}if(e.keyCode===27) {\$('#" . $idE . "').trigger('endEdit');}});";
+			$focusOut="if(e.relatedTarget==null)elm.trigger('endEdit');";
+			$this->_editableContent=$field;
+			$keypress="$('#".$idF."').keyup(function(e){if(e.which == 13) {\$('#".$idE."').trigger('validate',{value: $('#'+idF+' input').val()});}if(e.keyCode===27) {\$('#".$idE."').trigger('endEdit');}});";
 		}
 		$this->_editableContent->setProperty("style", "display:none;");
-		$this->onCreate("let idF='" . $idF . "';let idE='" . $idE . "';let elm=$('#'+idE);let self=$('#" . $this->getIdentifier() . "');" . $keypress . "elm.on('validate',function(){self.html($('#'+idE+' input')." . $setValueProperty . ");elm.trigger('endEdit');});elm.on('endEdit',function(){self.show();$(this).hide();});elm.focusout(function(e){" . $focusOut . "});");
-		$this->onClick("let self=$(this);self.hide();" . $field->setJsContent("self.html()") . ";$('#" . $idF . " input').trigger('change');elm.show();$('#'+idE+' input').focus();");
+		$this->onCreate("let idF='".$idF."';let idE='".$idE."';let elm=$('#'+idE);let self=$('#".$this->getIdentifier()."');".$keypress."elm.on('validate',function(){self.html($('#'+idE+' input').".$setValueProperty.");elm.trigger('endEdit');});elm.on('endEdit',function(){self.show();$(this).hide();});elm.focusout(function(e){".$focusOut."});");
+		$this->onClick("let self=$(this);self.hide();".$field->setJsContent("self.html()").";$('#".$idF." input').trigger('change');elm.show();$('#'+idE+' input').focus();");
 	}
 
 	/**
@@ -151,8 +151,8 @@ 
 	 * {@inheritdoc}
 	 * @see \Ajax\common\html\BaseHtml::compile_once()
 	 */
-	protected function compile_once(\Ajax\JsUtils $js = NULL, &$view = NULL) {
-		if (! $this->_compiled && isset($this->_editableContent)) {
+	protected function compile_once(\Ajax\JsUtils $js=NULL, &$view=NULL) {
+		if (!$this->_compiled && isset($this->_editableContent)) {
 			$this->wrap("", $this->_editableContent);
 		}
 		parent::compile_once($js, $view);

Braces +16 added lines, -12 removed lines

@@ -35,17 +35,19 @@ 
 
 	public function addContent($content, $before = false) {
 		if (! \is_array($this->content)) {
-			if (isset($this->content))
-				$this->content = array(
+			if (isset($this->content)) {
+							$this->content = array(
 					$this->content
 				);
-			else
-				$this->content = array();
+			} else {
+							$this->content = array();
+			}
+		}
+		if ($before) {
+					\array_unshift($this->content, $content);
+		} else {
+					$this->content[] = $content;
 		}
-		if ($before)
-			\array_unshift($this->content, $content);
-		else
-			$this->content[] = $content;
 		return $this;
 	}
 
@@ -108,10 +110,12 @@ 
 	 * @return HtmlDoubleElement
 	 */
 	public function asLink($href = NULL, $target = NULL) {
-		if (isset($href))
-			$this->setProperty("href", $href);
-		if (isset($target))
-			$this->setProperty("target", $target);
+		if (isset($href)) {
+					$this->setProperty("href", $href);
+		}
+		if (isset($target)) {
+					$this->setProperty("target", $target);
+		}
 		return $this->setTagName("a");
 	}
 

Ajax/common/traits/JsUtilsAjaxTrait.php

Braces +20 added lines, -14 removed lines

@@ -73,8 +73,9 @@ 
 		$retour .= $this->_getOnAjaxDone($responseElement, $jqueryDone, $ajaxTransition, $jsCallback, $hasLoader, ($historize ? $originalSelector : null)) . "});\n";
 
 		$retour = $this->_addJsCondition($jsCondition, $retour);
-		if ($immediatly)
-			$this->jquery_code_for_compile[] = $retour;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[] = $retour;
+		}
 		return $retour;
 	}
 
@@ -157,10 +158,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"]) {
@@ -194,8 +196,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);
 		}
@@ -219,8 +222,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);
 	}
@@ -254,8 +258,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;
+			}
 		}
 	}
 
@@ -820,8 +825,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;
 	}
 

Spacing +222 added lines, -222 removed lines

@@ -15,71 +15,71 @@ 
 
 	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, $listenerOn = false);
+	abstract public function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false, $immediatly=true, $listenerOn=false);
 
-	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 === 'response') {
+		} elseif ($hasLoader==='response') {
 			$this->addResponseLoading($retour, $responseElement, $ajaxLoader);
-		} elseif ($hasLoader === 'internal-x') {
+		} elseif ($hasLoader==='internal-x') {
 			$this->addLoading($retour, '$(this).closest(".item, .step")', $ajaxLoader);
-		} elseif ($hasLoader === 'internal') {
-			$retour .= "\n$(this).addClass('loading');";
+		} elseif ($hasLoader==='internal') {
+			$retour.="\n$(this).addClass('loading');";
 		} elseif (\is_string($hasLoader)) {
 			$this->addLoading($retour, $hasLoader, $ajaxLoader);
 		}
-		$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;
 		}
 		if ($csrf) {
-			$csrf = (is_string($csrf)) ? $csrf : 'csrf-token';
-			$parameters["beforeSend"] = "jqXHR.setRequestHeader('{$csrf}', $('meta[name=\"{$csrf}\"]').attr('content'));";
+			$csrf=(is_string($csrf)) ? $csrf : 'csrf-token';
+			$parameters["beforeSend"]="jqXHR.setRequestHeader('{$csrf}', $('meta[name=\"{$csrf}\"]').attr('content'));";
 		}
 		if (isset($partial)) {
-			$ajaxParameters["xhr"] = "xhrProvider";
-			$retour .= "var xhr = $.ajaxSettings.xhr();function xhrProvider() {return xhr;};xhr.onreadystatechange = function (e) { if (3==e.target.readyState){let response=e.target.responseText;" . $partial . ";}; };";
+			$ajaxParameters["xhr"]="xhrProvider";
+			$retour.="var xhr = $.ajaxSettings.xhr();function xhrProvider() {return xhr;};xhr.onreadystatechange = function (e) { if (3==e.target.readyState){let response=e.target.responseText;".$partial.";}; };";
 		}
 		$this->createAjaxParameters($ajaxParameters, $parameters);
-		$retour .= "$.ajax({" . $this->implodeAjaxParameters($ajaxParameters) . "}).done(function( data, textStatus, jqXHR ) {\n";
-		$retour .= $this->_getOnAjaxDone($responseElement, $jqueryDone, $ajaxTransition, $jsCallback, $hasLoader, ($historize ? $originalSelector : null)) . "});\n";
+		$retour.="$.ajax({".$this->implodeAjaxParameters($ajaxParameters)."}).done(function( data, textStatus, jqXHR ) {\n";
+		$retour.=$this->_getOnAjaxDone($responseElement, $jqueryDone, $ajaxTransition, $jsCallback, $hasLoader, ($historize ? $originalSelector : null))."});\n";
 
-		$retour = $this->_addJsCondition($jsCondition, $retour);
+		$retour=$this->_addJsCondition($jsCondition, $retour);
 		if ($immediatly)
-			$this->jquery_code_for_compile[] = $retour;
+			$this->jquery_code_for_compile[]=$retour;
 		return $retour;
 	}
 
 	protected function createAjaxParameters(&$original, $parameters) {
-		$validParameters = [
+		$validParameters=[
 			"contentType" => "%value%",
 			"dataType" => "'%value%'",
 			"beforeSend" => "function(jqXHR,settings){%value%}",
@@ -88,21 +88,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;
@@ -110,29 +110,29 @@ 
 
 	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 .= "let elmUrl=$(this).attr('" . $attr . "')||'';";
-				$retour .= "url=(!/^((http|https|ftp):\/\/)/.test(elmUrl))?url+'" . $slash . "'+elmUrl:elmUrl;\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.="let elmUrl=$(this).attr('".$attr."')||'';";
+				$retour.="url=(!/^((http|https|ftp):\/\/)/.test(elmUrl))?url+'".$slash."'+elmUrl:elmUrl;\n";
 			}
 		}
 		return $retour;
@@ -142,110 +142,110 @@ 
 		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');";
-		} elseif ($hasLoader === 'internal-x') {
-			$retour .= "\n$(self).children('.ajax-loader').remove();";
+		if ($hasLoader==='internal') {
+			$retour.="\n$(self).removeClass('loading');";
+		} elseif ($hasLoader==='internal-x') {
+			$retour.="\n$(self).children('.ajax-loader').remove();";
 		} else {
-			$retour .= "\n$(self).find('.loading').removeClass('loading');";
+			$retour.="\n$(self).find('.loading').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 _getFormElement($formElement) {
 		if (JString::isNotNull($formElement)) {
-			$formElement = Javascript::prep_value($formElement);
+			$formElement=Javascript::prep_value($formElement);
 		}
 		return $formElement;
 	}
 
 	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']) || ! JString::contains($ajaxParameters['contentType'], 'json')) {
-				return '$.param(' . $params . ')';
+			if (!isset($ajaxParameters['contentType']) || !JString::contains($ajaxParameters['contentType'], 'json')) {
+				return '$.param('.$params.')';
 			} else {
-				return 'JSON.stringify(' . $params . ')';
+				return 'JSON.stringify('.$params.')';
 			}
 		}
 		return $params;
 	}
 
 	public static function _implodeParams($parameters) {
-		$allParameters = [];
+		$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 ui active inverted dimmer">' . $ajaxLoader . '</div>';
-		$retour .= "\t\t{$responseElement}.append('{$loading_notifier}');\n";
+		$loading_notifier='<div class="ajax-loader ui active inverted dimmer">'.$ajaxLoader.'</div>';
+		$retour.="\t\t{$responseElement}.append('{$loading_notifier}');\n";
 	}
 
-	protected function addResponseLoading(&$retour, $responseElement, $ajaxLoader = null) {
-		if (! isset($ajaxLoader)) {
-			$ajaxLoader = $this->ajaxLoader;
+	protected function addResponseLoading(&$retour, $responseElement, $ajaxLoader=null) {
+		if (!isset($ajaxLoader)) {
+			$ajaxLoader=$this->ajaxLoader;
 		}
-		$loading_notifier = '<div class="ajax-loader">' . $ajaxLoader . '</div>';
-		$retour .= "{$responseElement}.empty();\n";
-		$retour .= "\t\t{$responseElement}.prepend('{$loading_notifier}');\n";
+		$loading_notifier='<div class="ajax-loader">'.$ajaxLoader.'</div>';
+		$retour.="{$responseElement}.empty();\n";
+		$retour.="\t\t{$responseElement}.prepend('{$loading_notifier}');\n";
 	}
 
 	protected function setAjaxDataCall($params) {
-		$result = null;
-		if (! \is_callable($params)) {
-			$result = function ($responseElement, $jqueryDone = 'html') use ($params) {
+		$result=null;
+		if (!\is_callable($params)) {
+			$result=function($responseElement, $jqueryDone='html') use ($params) {
 				return AjaxTransition::{$params}($responseElement, $jqueryDone);
 			};
 		}
@@ -254,13 +254,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;
 	}
 
 	/**
@@ -271,7 +271,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);
 	}
 
@@ -285,8 +285,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,"before"=>null)
 	 */
-	public function get($url, $responseElement = '', $parameters = []) {
-		$parameters['immediatly'] = true;
+	public function get($url, $responseElement='', $parameters=[]) {
+		$parameters['immediatly']=true;
 		return $this->_get($url, $responseElement, $parameters);
 	}
 
@@ -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,"before"=>null)
 	 */
-	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);
 	}
 
@@ -325,7 +325,7 @@ 
 	 *        	$immediatly
 	 * @return string
 	 */
-	public function ajaxInterval($method, $url, $interval, $globalName = null, $responseElement = '', $parameters = [], $immediatly = true) {
+	public function ajaxInterval($method, $url, $interval, $globalName=null, $responseElement='', $parameters=[], $immediatly=true) {
 		return $this->interval($this->ajaxDeferred($method, $url, $responseElement, $parameters), $interval, $globalName, $immediatly);
 	}
 
@@ -341,8 +341,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,"before"=>null)
 	 */
-	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);
 	}
 
@@ -356,15 +356,15 @@ 
 	 * @param array $parameters
 	 *        	default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","context"=>"document","jsCondition"=>NULL,"headers"=>null,"immediatly"=>false,"before"=>null)
 	 */
-	private function _json($url, $method = "get", $parameters = []) {
-		$parameters = \array_merge($parameters, [
+	private function _json($url, $method="get", $parameters=[]) {
+		$parameters=\array_merge($parameters, [
 			"hasLoader" => false
 		]);
-		$jsCallback = isset($parameters['jsCallback']) ? $parameters['jsCallback'] : "";
-		$context = isset($parameters['context']) ? $parameters['context'] : "document";
-		$retour = "\tdata=($.isPlainObject(data))?data:JSON.parse(data);\t" . $jsCallback . ";" . "\n\tfor(var key in data){" . "if($('#'+key," . $context . ").length){ if($('#'+key," . $context . ").is('[value]')) { $('#'+key," . $context . ").val(data[key]);} else { $('#'+key," . $context . ").html(data[key]); }}};\n";
-		$retour .= "\t$(document).trigger('jsonReady',[data]);\n";
-		$parameters["jsCallback"] = $retour;
+		$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);
 	}
 
@@ -378,7 +378,7 @@ 
 	 * @param array $parameters
 	 *        	default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","context"=>"document","jsCondition"=>NULL,"headers"=>null,"immediatly"=>false,"before"=>null)
 	 */
-	public function json($url, $method = "get", $parameters = []) {
+	public function json($url, $method="get", $parameters=[]) {
 		return $this->_json($url, $method, $parameters);
 	}
 
@@ -394,7 +394,7 @@ 
 	 * @param array $parameters
 	 *        	default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","params"=>"{}","method"=>"get","immediatly"=>true,"before"=>null,"listenerOn"=>false)
 	 */
-	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,
@@ -414,8 +414,8 @@ 
 	 * @param array $parameters
 	 *        	default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","context"=>"document","jsCondition"=>NULL,"headers"=>null,"immediatly"=>false,"before"=>null)
 	 */
-	public function jsonDeferred($url, $method = 'get', $parameters = []) {
-		$parameters['immediatly'] = false;
+	public function jsonDeferred($url, $method='get', $parameters=[]) {
+		$parameters['immediatly']=false;
 		return $this->_json($url, $method, $parameters);
 	}
 
@@ -430,29 +430,29 @@ 
 	 * @param array $parameters
 	 *        	default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","context"=>null,"jsCondition"=>NULL,"headers"=>null,"immediatly"=>false,"rowClass"=>"_json","before"=>null)
 	 */
-	private function _jsonArray($maskSelector, $url, $method = 'get', $parameters = []) {
-		$parameters = \array_merge($parameters, [
+	private function _jsonArray($maskSelector, $url, $method='get', $parameters=[]) {
+		$parameters=\array_merge($parameters, [
 			"hasLoader" => false
 		]);
-		$rowClass = isset($parameters['rowClass']) ? $parameters['rowClass'] : "_json";
-		$jsCallback = isset($parameters['jsCallback']) ? $parameters['jsCallback'] : "";
-		$context = isset($parameters['context']) ? $parameters['context'] : null;
-		if ($context === null) {
-			$parent = "$('" . $maskSelector . "').parent()";
-			$newElm = "$('#'+newId)";
+		$rowClass=isset($parameters['rowClass']) ? $parameters['rowClass'] : "_json";
+		$jsCallback=isset($parameters['jsCallback']) ? $parameters['jsCallback'] : "";
+		$context=isset($parameters['context']) ? $parameters['context'] : null;
+		if ($context===null) {
+			$parent="$('".$maskSelector."').parent()";
+			$newElm="$('#'+newId)";
 		} else {
-			$parent = $context;
-			$newElm = $context . ".find('#'+newId)";
+			$parent=$context;
+			$newElm=$context.".find('#'+newId)";
 		}
-		$appendTo = "\t\tnewElm.appendTo(" . $parent . ");\n";
-		$retour = $parent . ".find('.{$rowClass}').remove();";
-		$retour .= "\tdata=($.isPlainObject(data)||$.isArray(data))?data:JSON.parse(data);\n$.each(data, function(index, value) {\n" . "\tvar created=false;var maskElm=$('" . $maskSelector . "').first();maskElm.hide();" . "\tvar newId=(maskElm.attr('id') || 'mask')+'-'+index;" . "\tvar newElm=" . $newElm . ";\n" . "\tif(!newElm.length){\n" . "\t\tnewElm=maskElm.clone();
+		$appendTo="\t\tnewElm.appendTo(".$parent.");\n";
+		$retour=$parent.".find('.{$rowClass}').remove();";
+		$retour.="\tdata=($.isPlainObject(data)||$.isArray(data))?data:JSON.parse(data);\n$.each(data, function(index, value) {\n"."\tvar created=false;var maskElm=$('".$maskSelector."').first();maskElm.hide();"."\tvar newId=(maskElm.attr('id') || 'mask')+'-'+index;"."\tvar newElm=".$newElm.";\n"."\tif(!newElm.length){\n"."\t\tnewElm=maskElm.clone();
 		newElm.attr('id',newId);\n;newElm.addClass('{$rowClass}').removeClass('_jsonArrayModel');\nnewElm.find('[id]').each(function(){ var newId=$(this).attr('id')+'-'+index;$(this).attr('id',newId).removeClass('_jsonArrayChecked');});\n";
-		$retour .= $appendTo;
-		$retour .= "\t}\n" . "\tfor(var key in value){\n" . "\t\t\tvar html = $('<div />').append($(newElm).clone()).html();\n" . "\t\t\tif(html.indexOf('__'+key+'__')>-1){\n" . "\t\t\t\tcontent=$(html.split('__'+key+'__').join(value[key]));\n" . "\t\t\t\t$(newElm).replaceWith(content);newElm=content;\n" . "\t\t\t}\n" . "\t\tvar sel='[data-id=\"'+key+'\"]';if($(sel,newElm).length){\n" . "\t\t\tvar selElm=$(sel,newElm);\n" . "\t\t\t if(selElm.is('[value]')) { selElm.attr('value',value[key]);selElm.val(value[key]);} else { selElm.html(value[key]); }\n" . "\t\t}\n" . "}\n" . "\t$(newElm).show(true);" . "\n" . "\t$(newElm).removeClass('hide');" . "});\n";
-		$retour .= "\t$(document).trigger('jsonReady',[data]);\n";
-		$retour .= "\t" . $jsCallback;
-		$parameters["jsCallback"] = $retour;
+		$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);
 	}
 
@@ -467,7 +467,7 @@ 
 	 * @param array $parameters
 	 *        	default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","context"=>null,"jsCondition"=>NULL,"headers"=>null,"immediatly"=>false,"rowClass"=>"_json","before"=>null)
 	 */
-	public function jsonArray($maskSelector, $url, $method = 'get', $parameters = []) {
+	public function jsonArray($maskSelector, $url, $method='get', $parameters=[]) {
 		return $this->_jsonArray($maskSelector, $url, $method, $parameters);
 	}
 
@@ -482,8 +482,8 @@ 
 	 * @param array $parameters
 	 *        	default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","context"=>null,"jsCondition"=>NULL,"headers"=>null,"rowClass"=>"_json","before"=>null)
 	 */
-	public function jsonArrayDeferred($maskSelector, $url, $method = 'get', $parameters = []) {
-		$parameters['immediatly'] = false;
+	public function jsonArrayDeferred($maskSelector, $url, $method='get', $parameters=[]) {
+		$parameters['immediatly']=false;
 		return $this->jsonArray($maskSelector, $url, $method, $parameters);
 	}
 
@@ -499,7 +499,7 @@ 
 	 * @param array $parameters
 	 *        	default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","params"=>"{}","method"=>"get","rowClass"=>"_json","immediatly"=>true,"before"=>null,"listenerOn"=>false)
 	 */
-	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,
@@ -520,8 +520,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,"before"=>null)
 	 */
-	public function getDeferred($url, $responseElement = "", $parameters = []) {
-		$parameters['immediatly'] = false;
+	public function getDeferred($url, $responseElement="", $parameters=[]) {
+		$parameters['immediatly']=false;
 		return $this->_get($url, $responseElement, $parameters);
 	}
 
@@ -540,8 +540,8 @@ 
 	 * @param array $parameters
 	 *        	default : array("preventDefault"=>true,"stopPropagation"=>true,"params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>null,"headers"=>null,"historize"=>false,"before"=>null,"listenerOn"=>false)
 	 */
-	public function getOn($event, $element, $url, $responseElement = "", $parameters = array()) {
-		$parameters['method'] = 'get';
+	public function getOn($event, $element, $url, $responseElement="", $parameters=array()) {
+		$parameters['method']='get';
 		return $this->ajaxOn($event, $element, $url, $responseElement, $parameters);
 	}
 
@@ -560,7 +560,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,"before"=>null,"listenerOn"=>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,
@@ -584,7 +584,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,"before"=>null,"listenerOn"=>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);
 	}
 
@@ -601,7 +601,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,"before"=>null,"listenerOn"=>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);
 	}
 
@@ -616,18 +616,18 @@ 
 	 *        	default : array("preventDefault"=>true,"stopPropagation"=>true,"params"=>"{}","jsCallback"=>NULL,"attr"=>"href","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","jsCondition"=>NULL,"headers"=>null,"historize"=>true,"before"=>null,"listenerOn"=>false)
 	 * @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")%';
 		} else {
-			$responseElement = '%$(self).attr("data-target") || "' . $responseElement . '"%';
+			$responseElement='%$(self).attr("data-target") || "'.$responseElement.'"%';
 		}
-		if (! isset($parameters['historize'])) {
-			$parameters['historize'] = true;
+		if (!isset($parameters['historize'])) {
+			$parameters['historize']=true;
 		}
-		if (! isset($parameters['jsCallback'])) {
-			$parameters['jsCallback'] = 'var event = jQuery.Event( "getHref" );event.url = url;$(self).trigger(event);';
+		if (!isset($parameters['jsCallback'])) {
+			$parameters['jsCallback']='var event = jQuery.Event( "getHref" );event.url = url;$(self).trigger(event);';
 		}
 		return $this->getOnClick($element, "", $responseElement, $parameters);
 	}
@@ -643,15 +643,15 @@ 
 	 *        	default : array("preventDefault"=>true,"stopPropagation"=>true,"params"=>"{}","jsCallback"=>NULL,"attr"=>"href","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","jsCondition"=>NULL,"headers"=>null,"historize"=>true,"before"=>null,"listenerOn"=>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")%';
 		} else {
-			$responseElement = '%$(self).attr("data-target") || "' . $responseElement . '"%';
+			$responseElement='%$(self).attr("data-target") || "'.$responseElement.'"%';
 		}
-		if (! isset($parameters['historize'])) {
-			$parameters['historize'] = true;
+		if (!isset($parameters['historize'])) {
+			$parameters['historize']=true;
 		}
 		return $this->postOnClick($element, '', '{}', $responseElement, $parameters);
 	}
@@ -667,29 +667,29 @@ 
 	 *        	default : array("preventDefault"=>true,"stopPropagation"=>true,"params"=>"{}","jsCallback"=>NULL,"attr"=>"href","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","jsCondition"=>NULL,"headers"=>null,"historize"=>true,"before"=>null,"listenerOn"=>false)
 	 * @return $this
 	 */
-	public function postFormAction($element, $responseElement = "", $parameters = array()) {
-		$parameters['attr'] = 'action';
+	public function postFormAction($element, $responseElement="", $parameters=array()) {
+		$parameters['attr']='action';
 		if (JString::isNull($responseElement)) {
-			$responseElement = '%$(self).attr("data-target")%';
+			$responseElement='%$(self).attr("data-target")%';
 		} else {
-			$responseElement = '%$(self).attr("data-target") || "' . $responseElement . '"%';
+			$responseElement='%$(self).attr("data-target") || "'.$responseElement.'"%';
 		}
-		$formId = '%$(this).attr("id")%';
-		if (! isset($parameters['historize'])) {
-			$parameters['historize'] = true;
+		$formId='%$(this).attr("id")%';
+		if (!isset($parameters['historize'])) {
+			$parameters['historize']=true;
 		}
-		$parameters['preventDefault'] = true;
-		if (! isset($parameters['hasLoader'])) {
-			$parameters['hasLoader'] = '$(self).find("button, input[type=submit], input[type=button]")';
+		$parameters['preventDefault']=true;
+		if (!isset($parameters['hasLoader'])) {
+			$parameters['hasLoader']='$(self).find("button, input[type=submit], input[type=button]")';
 		}
-		if (! isset($parameters['jsCallback'])) {
-			$parameters['jsCallback'] = 'var event = jQuery.Event( "postFormAction" );event.params = Object.fromEntries(new URLSearchParams(params));$(self).trigger(event);';
+		if (!isset($parameters['jsCallback'])) {
+			$parameters['jsCallback']='var event = jQuery.Event( "postFormAction" );event.params = Object.fromEntries(new URLSearchParams(params));$(self).trigger(event);';
 		}
 		return $this->postFormOn('submit', $element, '', $formId, $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);
 	}
 
@@ -705,8 +705,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,"before"=>null)
 	 */
-	public function post($url, $params = "{}", $responseElement = "", $parameters = []) {
-		$parameters['immediatly'] = true;
+	public function post($url, $params="{}", $responseElement="", $parameters=[]) {
+		$parameters['immediatly']=true;
 		return $this->_post($url, $params, $responseElement, $parameters);
 	}
 
@@ -723,8 +723,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,"before"=>null)
 	 */
-	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);
 	}
 
@@ -743,9 +743,9 @@ 
 	 * @param array $parameters
 	 *        	default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null,"historize"=>false,"before"=>null,"listenerOn"=>false)
 	 */
-	public function postOn($event, $element, $url, $params = "{}", $responseElement = "", $parameters = array()) {
-		$parameters['method'] = 'post';
-		$parameters['params'] = $params;
+	public function postOn($event, $element, $url, $params="{}", $responseElement="", $parameters=array()) {
+		$parameters['method']='post';
+		$parameters['params']=$params;
 		return $this->ajaxOn($event, $element, $url, $responseElement, $parameters);
 	}
 
@@ -763,71 +763,71 @@ 
 	 * @param array $parameters
 	 *        	default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null,"historize"=>false,"before"=>null,"before"=>null,"listenerOn"=>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;
+		$params='{}';
+		$validation=false;
 		\extract($parameters);
-		$async = ($async) ? 'true' : 'false';
-		$jsCallback = isset($jsCallback) ? $jsCallback : "";
-		$retour = $this->_getAjaxUrl($url, $attr);
-		$form = $this->_getFormElement($form);
-		$retour .= "\n$('#'+" . $form . ").trigger('ajaxSubmit');";
-		if (! isset($contentType) || $contentType != 'false') {
-			$retour .= "\nvar params=$('#'+" . $form . ").serialize();\n";
+		$async=($async) ? 'true' : 'false';
+		$jsCallback=isset($jsCallback) ? $jsCallback : "";
+		$retour=$this->_getAjaxUrl($url, $attr);
+		$form=$this->_getFormElement($form);
+		$retour.="\n$('#'+".$form.").trigger('ajaxSubmit');";
+		if (!isset($contentType) || $contentType!='false') {
+			$retour.="\nvar params=$('#'+".$form.").serialize();\n";
 			if (isset($params)) {
-				$retour .= "params+='&'+" . self::_correctParams($params) . ";\n";
+				$retour.="params+='&'+".self::_correctParams($params).";\n";
 			}
 		} else {
-			$retour .= "\nvar params=new FormData($('#'+" . $form . ")[0]);\n";
+			$retour.="\nvar params=new FormData($('#'+".$form.")[0]);\n";
 		}
-		$responseElement = $this->_getResponseElement($responseElement);
-		$retour .= "var self=this;\n";
-		$before = isset($before) ? $before : "";
-		$retour .= $before;
-		if ($hasLoader === true) {
+		$responseElement=$this->_getResponseElement($responseElement);
+		$retour.="var self=this;\n";
+		$before=isset($before) ? $before : "";
+		$retour.=$before;
+		if ($hasLoader===true) {
 			$this->addLoading($retour, $responseElement, $ajaxLoader);
-		} elseif ($hasLoader === 'response') {
+		} elseif ($hasLoader==='response') {
 			$this->addResponseLoading($retour, $responseElement, $ajaxLoader);
-		} elseif ($hasLoader === 'internal-x') {
+		} elseif ($hasLoader==='internal-x') {
 			$this->addLoading($retour, '$(this).closest(".item, .step")', $ajaxLoader);
-		} elseif ($hasLoader === 'internal') {
-			$retour .= "\n$(this).addClass('loading');";
+		} elseif ($hasLoader==='internal') {
+			$retour.="\n$(this).addClass('loading');";
 		} elseif (\is_string($hasLoader)) {
-			$retour .= "\n$hasLoader.addClass('loading');";
+			$retour.="\n$hasLoader.addClass('loading');";
 		}
-		$ajaxParameters = [
+		$ajaxParameters=[
 			"url" => "url",
 			"method" => "'POST'",
 			"data" => "params",
 			"async" => $async
 		];
 		if (isset($headers)) {
-			$ajaxParameters["headers"] = $headers;
+			$ajaxParameters["headers"]=$headers;
 		}
 		if (isset($partial)) {
-			$ajaxParameters["xhr"] = "xhrProvider";
-			$retour .= "var xhr = $.ajaxSettings.xhr();function xhrProvider() {return xhr;};xhr.onreadystatechange = function (e) { if (3==e.target.readyState){let response=e.target.responseText;" . $partial . ";}; };";
+			$ajaxParameters["xhr"]="xhrProvider";
+			$retour.="var xhr = $.ajaxSettings.xhr();function xhrProvider() {return xhr;};xhr.onreadystatechange = function (e) { if (3==e.target.readyState){let response=e.target.responseText;".$partial.";}; };";
 		}
 		$this->createAjaxParameters($ajaxParameters, $parameters);
-		$retour .= "$.ajax({" . $this->implodeAjaxParameters($ajaxParameters) . "}).done(function( data ) {\n";
-		$retour .= $this->_getOnAjaxDone($responseElement, $jqueryDone, $ajaxTransition, $jsCallback, $hasLoader) . "});\n";
+		$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;
 	}
 
@@ -843,8 +843,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,"before"=>null)
 	 */
-	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);
 	}
 
@@ -861,8 +861,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,"before"=>null)
 	 */
-	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);
 	}
 
@@ -879,7 +879,7 @@ 
 	 * @param array $parameters
 	 *        	default : array("preventDefault"=>true,"stopPropagation"=>true,"validation"=>false,"params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>null,"headers"=>null,"historize"=>false,"before"=>null,"listenerOn"=>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,
@@ -901,11 +901,11 @@ 
 	 * @param array $parameters
 	 *        	default : array("preventDefault"=>true,"stopPropagation"=>true,"validation"=>false,"params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>null,"headers"=>null,"historize"=>false,"before"=>null,"listenerOn"=>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);
 	}
 
-	public function addCsrf($name = 'csrf-token') {
+	public function addCsrf($name='csrf-token') {
 		return "
 		$.ajaxSetup({
 			beforeSend: function(xhr, settings) {

Ajax/semantic/widgets/dataform/DataForm.php

Spacing +40 added lines, -40 removed lines

@@ -24,39 +24,39 @@ 
 	private $_inverted;
 	
 	public function __construct($identifier, $modelInstance=NULL) {
-		parent::__construct($identifier, null,$modelInstance);
+		parent::__construct($identifier, null, $modelInstance);
 		$this->_form=new HtmlForm($identifier);
 		$this->_init(new FormInstanceViewer($identifier), 'form', $this->_form, true);
 	}
 
-	protected function _getFieldIdentifier($prefix,$name=''){
+	protected function _getFieldIdentifier($prefix, $name='') {
 		return $this->identifier."-{$name}-".$this->_instanceViewer->getIdentifier();
 	}
 
-	public function compile(JsUtils $js=NULL,&$view=NULL){
-		if(!$this->_generated){
+	public function compile(JsUtils $js=NULL, &$view=NULL) {
+		if (!$this->_generated) {
 			$this->_instanceViewer->setInstance($this->_modelInstance);
 
 			$form=$this->content['form'];
 			$this->_generateContent($form);
 
-			if(isset($this->_toolbar)){
+			if (isset($this->_toolbar)) {
 				$this->_setToolbarPosition($form);
 			}
-			$this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE,'form',PositionInTable::AFTERTABLE]);
-			if($this->_inverted){
+			$this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE, 'form', PositionInTable::AFTERTABLE]);
+			if ($this->_inverted) {
 				$this->content['form']->setInverted(true);
 			}
 			$this->_generated=true;
 		}
-		return parent::compile($js,$view);
+		return parent::compile($js, $view);
 	}
 
 	/**
 	 * @param HtmlForm $form
 	 */
-	protected function _generateContent($form){
-		$values= $this->_instanceViewer->getValues();
+	protected function _generateContent($form) {
+		$values=$this->_instanceViewer->getValues();
 		$count=$this->_instanceViewer->count();
 		$separators=$this->_instanceViewer->getSeparators();
 		$headers=$this->_instanceViewer->getHeaders();
@@ -65,42 +65,42 @@ 
 		\sort($separators);
 		$size=\count($separators);
 		$nb=0;
-		if($size===1){
+		if ($size===1) {
 			$i=-1;
-			foreach ($values as $k=>$v){
-				$this->_generateFields($form, [$v], $headers, $i, $wrappers,$nb++,$names[$k]??'');
+			foreach ($values as $k=>$v) {
+				$this->_generateFields($form, [$v], $headers, $i, $wrappers, $nb++, $names[$k] ?? '');
 				$i++;
 			}
-		}else{
+		} else {
 			$separators[]=$count;
-			for($i=0;$i<$size;$i++){
-				$fields=\array_slice($values, $separators[$i]+1,$separators[$i+1]-$separators[$i]);
-				$this->_generateFields($form, $fields, $headers, $separators[$i], $wrappers,$nb++,$names[$i]??'');
+			for ($i=0; $i<$size; $i++) {
+				$fields=\array_slice($values, $separators[$i]+1, $separators[$i+1]-$separators[$i]);
+				$this->_generateFields($form, $fields, $headers, $separators[$i], $wrappers, $nb++, $names[$i] ?? '');
 			}
 		}
-		if($this->_hasRules && !$this->getForm()->hasValidationParams()){
+		if ($this->_hasRules && !$this->getForm()->hasValidationParams()) {
 				$this->setValidationParams(['inline'=>true]);
 		}
 	}
 
-	protected function _generateFields($form, $values, $headers, $sepFirst, $wrappers, $nb, $name){
+	protected function _generateFields($form, $values, $headers, $sepFirst, $wrappers, $nb, $name) {
 		$wrapper=null;
-		if(isset($headers[$sepFirst+1]))
-			$form->addHeader($headers[$sepFirst+1],4,true);
-		if(isset($wrappers[$sepFirst+1])){
+		if (isset($headers[$sepFirst+1]))
+			$form->addHeader($headers[$sepFirst+1], 4, true);
+		if (isset($wrappers[$sepFirst+1])) {
 			$wrapper=$wrappers[$sepFirst+1];
 		}
 		$count=\count($values);
-		if($count===1){
+		if ($count===1) {
 			$added=$form->addField($values[0]);
-		}elseif($count>1){
+		}elseif ($count>1) {
 			$added=$form->addFields($values);
-		}else
+		} else
 			return;
-		if(isset($wrapper)){
-			$added->wrap($wrapper[0],$wrapper[1]);
+		if (isset($wrapper)) {
+			$added->wrap($wrapper[0], $wrapper[1]);
 		}
-		$this->execHook('onGenerateFields',$added,$nb,$name);
+		$this->execHook('onGenerateFields', $added, $nb, $name);
 	}
 	
 	/**
@@ -108,18 +108,18 @@ 
 	 * the generated field is the first parameter
 	 * @param callable $callback the fonction to call when a field is generated
 	 */
-	public function onGenerateField($callback){
-		$this->addHook('onGenerateFields',$callback);
+	public function onGenerateField($callback) {
+		$this->addHook('onGenerateFields', $callback);
 	}
 
 	/**
 	 * @return HtmlForm
 	 */
-	public function getForm(){
+	public function getForm() {
 		return $this->content['form'];
 	}
 
-	public function addSeparatorAfter($fieldNum){
+	public function addSeparatorAfter($fieldNum) {
 		$fieldNum=$this->_getIndex($fieldNum);
 		$this->_instanceViewer->addSeparatorAfter($fieldNum);
 		return $this;
@@ -134,12 +134,12 @@ 
 		return $this;
 	}
 
-	public function fieldAsReset($index,$cssStyle=NULL,$attributes=NULL){
-		return $this->_fieldAs(function($id,$name,$value) use ($cssStyle){
-			$button=new HtmlButton($id,$value,$cssStyle);
+	public function fieldAsReset($index, $cssStyle=NULL, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value) use ($cssStyle){
+			$button=new HtmlButton($id, $value, $cssStyle);
 			$button->setProperty('type', 'reset');
 			return $button;
-		}, $index,$attributes);
+		}, $index, $attributes);
 	}
 
 	/**
@@ -158,19 +158,19 @@ 
 		$this->content[$this->_toolbarPosition]=$this->_toolbar;
 	}
 
-	public function addDividerBefore($index,$title){
+	public function addDividerBefore($index, $title) {
 		$index=$this->_getIndex($index);
 		$this->_instanceViewer->addHeaderDividerBefore($index, $title);
 		return $this;
 	}
 
-	public function addWrapper($index,$contentBefore,$contentAfter=null){
+	public function addWrapper($index, $contentBefore, $contentAfter=null) {
 		$index=$this->_getIndex($index);
-		$this->_instanceViewer->addWrapper($index, $contentBefore,$contentAfter);
+		$this->_instanceViewer->addWrapper($index, $contentBefore, $contentAfter);
 		return $this;
 	}
 
-	public function run(JsUtils $js){
+	public function run(JsUtils $js) {
 		parent::run($js);
 	}
 	

Braces +8 added lines, -6 removed lines

@@ -71,7 +71,7 @@ 
 				$this->_generateFields($form, [$v], $headers, $i, $wrappers,$nb++,$names[$k]??'');
 				$i++;
 			}
-		}else{
+		} else{
 			$separators[]=$count;
 			for($i=0;$i<$size;$i++){
 				$fields=\array_slice($values, $separators[$i]+1,$separators[$i+1]-$separators[$i]);
@@ -85,18 +85,20 @@ 
 
 	protected function _generateFields($form, $values, $headers, $sepFirst, $wrappers, $nb, $name){
 		$wrapper=null;
-		if(isset($headers[$sepFirst+1]))
-			$form->addHeader($headers[$sepFirst+1],4,true);
+		if(isset($headers[$sepFirst+1])) {
+					$form->addHeader($headers[$sepFirst+1],4,true);
+		}
 		if(isset($wrappers[$sepFirst+1])){
 			$wrapper=$wrappers[$sepFirst+1];
 		}
 		$count=\count($values);
 		if($count===1){
 			$added=$form->addField($values[0]);
-		}elseif($count>1){
+		} elseif($count>1){
 			$added=$form->addFields($values);
-		}else
-			return;
+		} else {
+					return;
+		}
 		if(isset($wrapper)){
 			$added->wrap($wrapper[0],$wrapper[1]);
 		}