phpMv / phpMv-UI

Ajax/semantic/html/elements/HtmlEmoji.php

Spacing +5 added lines, -5 removed lines

@@ -54,22 +54,22 @@
 	 * @param string $target
 	 * @return HtmlEmoji
 	 */
-	public function asLink($href=NULL,$target=NULL) {
+	public function asLink($href=NULL, $target=NULL) {
 		if (isset($href)) {
 			$_target="";
-			if(isset($target))
+			if (isset($target))
 				$_target="target='{$target}'";
-			$this->wrap("<a href='" . $href . "' {$_target}>", "</a>");
+			$this->wrap("<a href='".$href."' {$_target}>", "</a>");
 		}
 		return $this->addToProperty("class", "link");
 	}
 
 	public function addLabel($label, $before=false, $emoji=null) {
-		if($before)
+		if ($before)
 			$this->wrap($label);
 		else
 			$this->wrap("", $label);
-		if($emoji!=null)
+		if ($emoji!=null)
 			$this->setEmoji($emoji);
 		return $this;
 	}

Braces +11 added lines, -8 removed lines

@@ -57,20 +57,23 @@
 	public function asLink($href=NULL,$target=NULL) {
 		if (isset($href)) {
 			$_target="";
-			if(isset($target))
-				$_target="target='{$target}'";
+			if(isset($target)) {
+							$_target="target='{$target}'";
+			}
 			$this->wrap("<a href='" . $href . "' {$_target}>", "</a>");
 		}
 		return $this->addToProperty("class", "link");
 	}
 
 	public function addLabel($label, $before=false, $emoji=null) {
-		if($before)
-			$this->wrap($label);
-		else
-			$this->wrap("", $label);
-		if($emoji!=null)
-			$this->setEmoji($emoji);
+		if($before) {
+					$this->wrap($label);
+		} else {
+					$this->wrap("", $label);
+		}
+		if($emoji!=null) {
+					$this->setEmoji($emoji);
+		}
 		return $this;
 	}
 

Ajax/semantic/html/content/HtmlListItem.php

Spacing +14 added lines, -14 removed lines

@@ -8,23 +8,23 @@ 
 
 	protected $image;
 
-	public function __construct($identifier, $content = NULL) {
+	public function __construct($identifier, $content=NULL) {
 		parent::__construct($identifier, "item", $content);
 	}
 
 	protected function initContent($content) {
 		if (\is_array($content)) {
-			if (JArray::isAssociative($content) === false) {
-				$icon = $content[0] ?? null;
-				$title = $content[1] ?? null;
-				$desc = $content[2] ?? null;
+			if (JArray::isAssociative($content)===false) {
+				$icon=$content[0] ?? null;
+				$title=$content[1] ?? null;
+				$desc=$content[2] ?? null;
 			} else {
-				$icon = $content["icon"] ?? null;
-				$image = $content["image"] ?? null;
-				$title = $content["title"] ?? null;
-				$header = $content["header"] ?? null;
-				$desc = $content["description"] ?? null;
-				$items = $content["items"] ?? null;
+				$icon=$content["icon"] ?? null;
+				$image=$content["image"] ?? null;
+				$title=$content["title"] ?? null;
+				$header=$content["header"] ?? null;
+				$desc=$content["description"] ?? null;
+				$items=$content["items"] ?? null;
 			}
 			if (isset($icon)) {
 				$this->setIcon($icon);
@@ -45,12 +45,12 @@ 
 		}
 	}
 
-	public function addList($items = array(), $ordered = false) {
-		$list = new HtmlList("", $items);
+	public function addList($items=array(), $ordered=false) {
+		$list=new HtmlList("", $items);
 		if ($ordered)
 			$list->setOrdered();
 		$list->setClass("list");
-		$this->content["list"] = $list;
+		$this->content["list"]=$list;
 		return $list;
 	}
 

Braces +3 added lines, -2 removed lines

@@ -47,8 +47,9 @@
 
 	public function addList($items = array(), $ordered = false) {
 		$list = new HtmlList("", $items);
-		if ($ordered)
-			$list->setOrdered();
+		if ($ordered) {
+					$list->setOrdered();
+		}
 		$list->setClass("list");
 		$this->content["list"] = $list;
 		return $list;

Ajax/common/html/html5/HtmlInput.php

Spacing +7 added lines, -7 removed lines

@@ -9,7 +9,7 @@ 
 
 	protected $_placeholder;
 
-	public function __construct($identifier, $type = "text", $value = NULL, $placeholder = NULL) {
+	public function __construct($identifier, $type="text", $value=NULL, $placeholder=NULL) {
 		parent::__construct($identifier, "input");
 		$this->setProperty("name", $identifier);
 		$this->setValue($value);
@@ -27,23 +27,23 @@ 
 		return $this->setProperty("type", $value);
 	}
 
-	public function forceValue($value = 'true') {
-		$this->wrap('<input type="hidden" value="false" name="' . $this->identifier . '"/>');
+	public function forceValue($value='true') {
+		$this->wrap('<input type="hidden" value="false" name="'.$this->identifier.'"/>');
 		$this->setValue($value);
 		return $this;
 	}
 
 	public function setPlaceholder($value) {
 		if (JString::isNotNull($value))
-			$this->_placeholder = $value;
+			$this->_placeholder=$value;
 		return $this;
 	}
 
-	public function compile(JsUtils $js = NULL, &$view = NULL) {
-		$value = $this->_placeholder;
+	public function compile(JsUtils $js=NULL, &$view=NULL) {
+		$value=$this->_placeholder;
 		if (JString::isNull($value)) {
 			if (JString::isNotNull($this->getProperty("name")))
-				$value = \ucfirst($this->getProperty("name"));
+				$value=\ucfirst($this->getProperty("name"));
 		}
 		$this->setProperty("placeholder", $value);
 		return parent::compile($js, $view);

Braces +9 added lines, -6 removed lines

@@ -18,8 +18,9 @@ 
 	}
 
 	public function setValue($value) {
-		if (isset($value))
-			$this->setProperty("value", $value);
+		if (isset($value)) {
+					$this->setProperty("value", $value);
+		}
 		return $this;
 	}
 
@@ -34,16 +35,18 @@ 
 	}
 
 	public function setPlaceholder($value) {
-		if (JString::isNotNull($value))
-			$this->_placeholder = $value;
+		if (JString::isNotNull($value)) {
+					$this->_placeholder = $value;
+		}
 		return $this;
 	}
 
 	public function compile(JsUtils $js = NULL, &$view = NULL) {
 		$value = $this->_placeholder;
 		if (JString::isNull($value)) {
-			if (JString::isNotNull($this->getProperty("name")))
-				$value = \ucfirst($this->getProperty("name"));
+			if (JString::isNotNull($this->getProperty("name"))) {
+							$value = \ucfirst($this->getProperty("name"));
+			}
 		}
 		$this->setProperty("placeholder", $value);
 		return parent::compile($js, $view);

Ajax/service/JString.php

Spacing +21 added lines, -21 removed lines

@@ -4,64 +4,64 @@
 class JString {
 
 	public static function contains($hay, $needle) {
-		return strpos($hay, "$needle") !== false;
+		return strpos($hay, "$needle")!==false;
 	}
 
 	public static function startswith($hay, $needle) {
-		return substr($hay, 0, strlen($needle)) === $needle;
+		return substr($hay, 0, strlen($needle))===$needle;
 	}
 
 	public static function endswith($hay, $needle) {
-		return substr($hay, - strlen($needle)) === $needle;
+		return substr($hay, - strlen($needle))===$needle;
 	}
 
 	public static function isNull($s) {
-		return (! isset($s) || NULL === $s || "" === $s);
+		return (!isset($s) || NULL===$s || ""===$s);
 	}
 
 	public static function isNotNull($s) {
-		return (isset($s) && NULL !== $s && "" !== $s);
+		return (isset($s) && NULL!==$s && ""!==$s);
 	}
 
 	public static function isBoolean($value) {
-		return \is_bool($value) || $value == 1 || $value == 0;
+		return \is_bool($value) || $value==1 || $value==0;
 	}
 
 	public static function isBooleanTrue($value) {
-		return $value == 1 || $value;
+		return $value==1 || $value;
 	}
 
 	public static function isBooleanFalse($value) {
-		return $value == 0 || ! $value;
+		return $value==0 || !$value;
 	}
 
-	public static function camelCaseToSeparated($input, $separator = " ") {
-		return strtolower(preg_replace('/(?<!^)[A-Z]/', $separator . '$0', $input));
+	public static function camelCaseToSeparated($input, $separator=" ") {
+		return strtolower(preg_replace('/(?<!^)[A-Z]/', $separator.'$0', $input));
 	}
 
 	public static function replaceAtFirst($subject, $from, $to) {
-		$from = '/\A' . preg_quote($from, '/') . '/';
+		$from='/\A'.preg_quote($from, '/').'/';
 		return \preg_replace($from, $to, $subject, 1);
 	}
 
 	public static function replaceAtLast($subject, $from, $to) {
-		$from = '/' . preg_quote($from, '/') . '\z/';
+		$from='/'.preg_quote($from, '/').'\z/';
 		return \preg_replace($from, $to, $subject, 1);
 	}
 
 	public static function replaceAtFirstAndLast($subject, $fromFirst, $toFirst, $fromLast, $toLast) {
-		$s = self::replaceAtFirst($subject, $fromFirst, $toFirst);
+		$s=self::replaceAtFirst($subject, $fromFirst, $toFirst);
 		return self::replaceAtLast($s, $fromLast, $toLast);
 	}
 
-	public static function getValueBetween(&$str, $before = "{{", $after = "}}") {
-		$matches = [];
-		$result = null;
-		$_before = \preg_quote($before);
-		$_after = \preg_quote($after);
-		if (\preg_match('/' . $_before . '(.*?)' . $_after . '/s', $str, $matches) === 1) {
-			$result = $matches[1];
-			$str = \str_replace($before . $result . $after, "", $str);
+	public static function getValueBetween(&$str, $before="{{", $after="}}") {
+		$matches=[];
+		$result=null;
+		$_before=\preg_quote($before);
+		$_after=\preg_quote($after);
+		if (\preg_match('/'.$_before.'(.*?)'.$_after.'/s', $str, $matches)===1) {
+			$result=$matches[1];
+			$str=\str_replace($before.$result.$after, "", $str);
 		}
 		return $result;
 	}

Braces +3 added lines, -2 removed lines

@@ -67,8 +67,9 @@
 	}
 
 	public static function doubleBackSlashes($value) {
-		if (\is_string($value))
-			return \str_replace("\\", "\\\\", $value);
+		if (\is_string($value)) {
+					return \str_replace("\\", "\\\\", $value);
+		}
 		return $value;
 	}
 

Ajax/semantic/html/elements/HtmlInput.php

Spacing +14 added lines, -14 removed lines

@@ -13,21 +13,21 @@ 
 use Ajax\semantic\html\elements\html5\HtmlDatalist;
 
 class HtmlInput extends HtmlSemDoubleElement {
-	use IconTrait,TextFieldsTrait,FieldTrait;
+	use IconTrait, TextFieldsTrait, FieldTrait;
 
-	public function __construct($identifier, $type = "text", $value = "", $placeholder = "") {
-		parent::__construct("div-" . $identifier, "div", "ui input");
-		$this->_identifier = $identifier;
-		$this->_libraryId = $identifier;
-		$this->content = [
+	public function __construct($identifier, $type="text", $value="", $placeholder="") {
+		parent::__construct("div-".$identifier, "div", "ui input");
+		$this->_identifier=$identifier;
+		$this->_libraryId=$identifier;
+		$this->content=[
 			"field" => new HtmlInput5($identifier, $type, $value, $placeholder)
 		];
-		$this->_states = [
+		$this->_states=[
 			State::DISABLED,
 			State::FOCUS,
 			State::ERROR
 		];
-		$this->_variations = [
+		$this->_variations=[
 			Variation::TRANSPARENT
 		];
 	}
@@ -40,16 +40,16 @@ 
 		return $this->content["field"];
 	}
 
-	public static function outline($identifier, $icon, $value = "", $placeholder = "") {
-		$result = new HtmlInput($identifier, "text", $value, $placeholder);
+	public static function outline($identifier, $icon, $value="", $placeholder="") {
+		$result=new HtmlInput($identifier, "text", $value, $placeholder);
 		$result->addToProperty("class", "transparent");
 		$result->addIcon($icon)->setOutline();
 		return $result;
 	}
 
 	public function run(JsUtils $js) {
-		$result = parent::run($js);
-		$result->attach("#" . $this->getDataField()
+		$result=parent::run($js);
+		$result->attach("#".$this->getDataField()
 			->getIdentifier());
 		return $result;
 	}
@@ -58,7 +58,7 @@ 
 		return $this->addToProperty("class", "transparent");
 	}
 
-	public function compile_once(\Ajax\JsUtils $js = NULL, &$view = NULL) {
+	public function compile_once(\Ajax\JsUtils $js=NULL, &$view=NULL) {
 		parent::compile_once($js, $view);
 		if (isset($this->content['file'])) {
 			$this->onCreate(Javascript::fileUploadBehavior($this->identifier));
@@ -66,7 +66,7 @@ 
 	}
 
 	public function addDataList($items) {
-		$dl = new HtmlDatalist('list-' . $this->identifier);
+		$dl=new HtmlDatalist('list-'.$this->identifier);
 		$dl->addItems($items);
 		$this->getDataField()->setProperty('list', $dl->getIdentifier());
 		$this->getDataField()->wrap($dl);

Ajax/semantic/html/elements/html5/HtmlDatalist.php

Spacing +1 added lines, -1 removed lines

@@ -11,7 +11,7 @@
 	}
 
 	protected function createItem($value) {
-		$elm = new HtmlDoubleElement("", "option");
+		$elm=new HtmlDoubleElement("", "option");
 		$elm->setProperty("value", $value);
 		$elm->setContent($value);
 		return $elm;

Ajax/common/traits/JsUtilsAjaxTrait.php

Braces +23 added lines, -16 removed lines

@@ -63,8 +63,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;
 	}
 
@@ -119,8 +120,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;
 	}
@@ -144,10 +146,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"]) {
@@ -170,8 +173,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);
 		}
@@ -195,8 +199,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);
 	}
@@ -222,8 +227,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;
+			}
 		}
 	}
 
@@ -755,8 +761,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 +186 added lines, -186 removed lines

@@ -15,61 +15,61 @@ 
 
 	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;
 		}
 		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%}",
@@ -78,21 +78,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;
@@ -100,27 +100,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;
 	}
@@ -129,91 +129,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']) || ! 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">' . $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);
 			};
 		}
@@ -222,13 +222,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;
 	}
 
 	/**
@@ -239,7 +239,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);
 	}
 
@@ -253,8 +253,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);
 	}
 
@@ -270,8 +270,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);
 	}
 
@@ -293,7 +293,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);
 	}
 
@@ -309,8 +309,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);
 	}
 
@@ -324,15 +324,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);
 	}
 
@@ -346,7 +346,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);
 	}
 
@@ -362,7 +362,7 @@ 
 	 * @param array $parameters
 	 *        	default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","params"=>"{}","method"=>"get","immediatly"=>true,"before"=>null)
 	 */
-	public function jsonOn($event, $element, $url, $method = "get", $parameters = array()) {
+	public function jsonOn($event, $element, $url, $method="get", $parameters=array()) {
 		$this->setDefaultParameters($parameters, [
 			"preventDefault" => true,
 			"stopPropagation" => true,
@@ -381,8 +381,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);
 	}
 
@@ -397,29 +397,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);
 	}
 
@@ -434,7 +434,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);
 	}
 
@@ -449,8 +449,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);
 	}
 
@@ -466,7 +466,7 @@ 
 	 * @param array $parameters
 	 *        	default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","params"=>"{}","method"=>"get","rowClass"=>"_json","immediatly"=>true,"before"=>null)
 	 */
-	public function jsonArrayOn($event, $element, $maskSelector, $url, $method = "get", $parameters = array()) {
+	public function jsonArrayOn($event, $element, $maskSelector, $url, $method="get", $parameters=array()) {
 		$this->setDefaultParameters($parameters, [
 			"preventDefault" => true,
 			"stopPropagation" => true,
@@ -486,8 +486,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);
 	}
 
@@ -506,7 +506,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,"before"=>null)
 	 */
-	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,
@@ -530,7 +530,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)
 	 */
-	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,
@@ -553,7 +553,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)
 	 */
-	public function ajaxOnClick($element, $url, $responseElement = "", $parameters = array()) {
+	public function ajaxOnClick($element, $url, $responseElement="", $parameters=array()) {
 		return $this->ajaxOn("click", $element, $url, $responseElement, $parameters);
 	}
 
@@ -570,7 +570,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)
 	 */
-	public function getOnClick($element, $url, $responseElement = "", $parameters = array()) {
+	public function getOnClick($element, $url, $responseElement="", $parameters=array()) {
 		return $this->getOn("click", $element, $url, $responseElement, $parameters);
 	}
 
@@ -585,15 +585,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)
 	 * @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;
 		}
 		return $this->getOnClick($element, "", $responseElement, $parameters);
 	}
@@ -609,21 +609,21 @@ 
 	 *        	default : array("preventDefault"=>true,"stopPropagation"=>true,"params"=>"{}","jsCallback"=>NULL,"attr"=>"href","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","jsCondition"=>NULL,"headers"=>null,"historize"=>true,"before"=>null)
 	 * @return $this
 	 */
-	public function postHref($element, $responseElement = "", $parameters = array()) {
-		$parameters["attr"] = "href";
+	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);
 	}
 
-	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);
 	}
 
@@ -639,8 +639,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);
 	}
 
@@ -657,8 +657,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);
 	}
 
@@ -677,7 +677,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,"before"=>null)
 	 */
-	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,
@@ -700,64 +700,64 @@ 
 	 * @param array $parameters
 	 *        	default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null,"historize"=>false,"before"=>null,"before"=>null)
 	 */
-	public function postOnClick($element, $url, $params = "{}", $responseElement = "", $parameters = array()) {
+	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);
-		$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);
+		$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 === "internal") {
-			$retour .= "\n$(this).addClass('loading');";
+		} elseif ($hasLoader==="internal") {
+			$retour.="\n$(this).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;
 	}
 
@@ -773,8 +773,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);
 	}
 
@@ -791,8 +791,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);
 	}
 
@@ -809,7 +809,7 @@ 
 	 * @param array $parameters
 	 *        	default : array("preventDefault"=>true,"stopPropagation"=>true,"validation"=>false,"params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>null,"headers"=>null,"historize"=>false,"before"=>null)
 	 */
-	public function 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,
@@ -830,7 +830,7 @@ 
 	 * @param array $parameters
 	 *        	default : array("preventDefault"=>true,"stopPropagation"=>true,"validation"=>false,"params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>null,"headers"=>null,"historize"=>false,"before"=>null)
 	 */
-	public function postFormOnClick($element, $url, $form, $responseElement = "", $parameters = array()) {
+	public function postFormOnClick($element, $url, $form, $responseElement="", $parameters=array()) {
 		return $this->postFormOn("click", $element, $url, $form, $responseElement, $parameters);
 	}
 }

Ajax/semantic/html/collections/table/traits/TableTrait.php

Spacing +22 added lines, -22 removed lines

@@ -10,9 +10,9 @@ 
  */
 trait TableTrait {
 
-	abstract public function addEvent($event, $jsCode, $stopPropagation = false, $preventDefault = false);
+	abstract public function addEvent($event, $jsCode, $stopPropagation=false, $preventDefault=false);
 
-	abstract public function getOn($event, $url, $responseElement = "", $parameters = array());
+	abstract public function getOn($event, $url, $responseElement="", $parameters=array());
 
 	protected function addToPropertyTable($property, $value) {
 		return $this->_self->addToProperty($property, $value);
@@ -22,8 +22,8 @@ 
 		return $this->addToPropertyTable("class", "celled");
 	}
 
-	public function setBasic($very = false) {
-		$table = $this->_self;
+	public function setBasic($very=false) {
+		$table=$this->_self;
 		if ($very)
 			$table->addToPropertyCtrl("class", "very", array(
 				"very"
@@ -33,8 +33,8 @@ 
 		));
 	}
 
-	public function setCompact($very = false) {
-		$table = $this->_self;
+	public function setCompact($very=false) {
+		$table=$this->_self;
 		if ($very)
 			$table->addToPropertyCtrl("class", "very", array(
 				"very"
@@ -56,8 +56,8 @@ 
 		return $this->addToPropertyTable("class", "structured");
 	}
 
-	public function setSortable($colIndex = NULL) {
-		$table = $this->_self;
+	public function setSortable($colIndex=NULL) {
+		$table=$this->_self;
 		if (isset($colIndex) && $table->hasPart("thead")) {
 			$table->getHeader()->sort($colIndex);
 		}
@@ -80,29 +80,29 @@ 
 		return $this->addToPropertyTable("class", "striped");
 	}
 
-	public function onRowClick($jsCode, $stopPropagation = false, $preventDefault = false) {
+	public function onRowClick($jsCode, $stopPropagation=false, $preventDefault=false) {
 		return $this->onRow("click", $jsCode, $stopPropagation, $preventDefault);
 	}
 
-	public function onRow($event, $jsCode, $stopPropagation = false, $preventDefault = false) {
-		return $this->_self->addEvent($event . "{{tbody tr}}", $jsCode, $stopPropagation, $preventDefault);
+	public function onRow($event, $jsCode, $stopPropagation=false, $preventDefault=false) {
+		return $this->_self->addEvent($event."{{tbody tr}}", $jsCode, $stopPropagation, $preventDefault);
 	}
 
-	public function getOnRow($event, $url, $responseElement = "", $parameters = array()) {
-		$jsCondition = '!$(this).closest("tr").hasClass("active")';
+	public function getOnRow($event, $url, $responseElement="", $parameters=array()) {
+		$jsCondition='!$(this).closest("tr").hasClass("active")';
 		if (isset($parameters['jsCondition'])) {
-			$jsCondition = '(' . $parameters['jsCondition'] . ' && ' . $jsCondition . ')';
+			$jsCondition='('.$parameters['jsCondition'].' && '.$jsCondition.')';
 		}
-		$parameters = \array_merge($parameters, [
+		$parameters=\array_merge($parameters, [
 			"stopPropagation" => false,
 			"preventDefault" => false,
 			"jsCondition" => $jsCondition
 		]);
-		$selector = "tbody tr";
+		$selector="tbody tr";
 		if (isset($parameters["selector"])) {
-			$selector = $parameters["selector"];
+			$selector=$parameters["selector"];
 		}
-		return $this->_self->getOn($event . "{{" . $selector . "}}", $url, $responseElement, $parameters);
+		return $this->_self->getOn($event."{{".$selector."}}", $url, $responseElement, $parameters);
 	}
 
 	public function onPageChange($jsCode) {
@@ -119,10 +119,10 @@ 
 		return $this->_self->getBsComponent()->getScript();
 	}
 
-	public function addEventsOnRun(JsUtils $js = NULL) {
-		$script = parent::addEventsOnRun($js);
-		$innerScript = $this->_self->getInnerScript();
-		if (! isset($innerScript)) {
+	public function addEventsOnRun(JsUtils $js=NULL) {
+		$script=parent::addEventsOnRun($js);
+		$innerScript=$this->_self->getInnerScript();
+		if (!isset($innerScript)) {
 			$this->_self->setInnerScript($script);
 		}
 		return $script;

Braces +6 added lines, -4 removed lines

@@ -24,10 +24,11 @@ 
 
 	public function setBasic($very = false) {
 		$table = $this->_self;
-		if ($very)
-			$table->addToPropertyCtrl("class", "very", array(
+		if ($very) {
+					$table->addToPropertyCtrl("class", "very", array(
 				"very"
 			));
+		}
 		return $table->addToPropertyCtrl("class", "basic", array(
 			"basic"
 		));
@@ -35,10 +36,11 @@ 
 
 	public function setCompact($very = false) {
 		$table = $this->_self;
-		if ($very)
-			$table->addToPropertyCtrl("class", "very", array(
+		if ($very) {
+					$table->addToPropertyCtrl("class", "very", array(
 				"very"
 			));
+		}
 		return $table->addToPropertyCtrl("class", "compact", array(
 			"compact"
 		));

Ajax/semantic/html/elements/HtmlList.php

Spacing +48 added lines, -48 removed lines

@@ -13,9 +13,9 @@ 
 
 	protected $_hasCheckedList;
 
-	protected $_fireOnInit = false;
+	protected $_fireOnInit=false;
 
-	protected $_ckItemChange = "";
+	protected $_ckItemChange="";
 
 	protected $_maxVisible;
 
@@ -23,25 +23,25 @@ 
 
 	protected $_visibility;
 
-	public function __construct($identifier, $items = array()) {
+	public function __construct($identifier, $items=array()) {
 		parent::__construct($identifier, "div", "ui list");
 		$this->addItems($items);
-		$this->_hasCheckedList = false;
+		$this->_hasCheckedList=false;
 	}
 
 	protected function createItem($value) {
-		$count = $this->count();
-		$item = new HtmlListItem("item-" . $this->identifier . "-" . $count, $value);
+		$count=$this->count();
+		$item=new HtmlListItem("item-".$this->identifier."-".$count, $value);
 		return $item;
 	}
 
 	public function addHeader($niveau, $content) {
-		$header = new HtmlHeader("header-" . $this->identifier, $niveau, $content, "page");
+		$header=new HtmlHeader("header-".$this->identifier, $niveau, $content, "page");
 		$this->wrap($header);
 		return $header;
 	}
 
-	public function getItemPart($index, $partName = "header") {
+	public function getItemPart($index, $partName="header") {
 		return $this->getItem($index)->getPart($partName);
 	}
 
@@ -49,15 +49,15 @@ 
 		return $this->contentAs($tagName);
 	}
 
-	public function asLinks($hrefs = [], $target = NUll) {
+	public function asLinks($hrefs=[], $target=NUll) {
 		$this->addToPropertyCtrl("class", "link", array(
 			"link"
 		));
 		return parent::asLinks($hrefs, $target);
 	}
 
-	public function addList($items = array()) {
-		$list = new HtmlList("", $items);
+	public function addList($items=array()) {
+		$list=new HtmlList("", $items);
 		$list->setClass("list");
 		return $this->addItem($list);
 	}
@@ -71,7 +71,7 @@ 
 	}
 
 	protected function getItemToAdd($item) {
-		$itemO = parent::getItemToAdd($item);
+		$itemO=parent::getItemToAdd($item);
 		if ($itemO instanceof AbstractCheckbox)
 			$itemO->addClass("item");
 		return $itemO;
@@ -90,11 +90,11 @@ 
 	}
 
 	public function run(JsUtils $js) {
-		if ($this->_hasCheckedList === true) {
-			$jsCode = include dirname(__FILE__) . '/../../components/jsTemplates/tplCheckedList.php';
-			$jsCode = \str_replace("%identifier%", "#" . $this->identifier, $jsCode);
-			$jsCode = \str_replace("%fireOnInit%", $this->_fireOnInit, $jsCode);
-			$jsCode = \str_replace("%onChange%", $this->_ckItemChange, $jsCode);
+		if ($this->_hasCheckedList===true) {
+			$jsCode=include dirname(__FILE__).'/../../components/jsTemplates/tplCheckedList.php';
+			$jsCode=\str_replace("%identifier%", "#".$this->identifier, $jsCode);
+			$jsCode=\str_replace("%fireOnInit%", $this->_fireOnInit, $jsCode);
+			$jsCode=\str_replace("%onChange%", $this->_ckItemChange, $jsCode);
 			$this->executeOnRun($jsCode);
 		}
 		/*
@@ -106,19 +106,19 @@ 
 	}
 
 	protected function addFollowPoints() {
-		$count = $this->count();
-		for ($i = $this->_maxVisible; $i < $count; $i ++) {
+		$count=$this->count();
+		for ($i=$this->_maxVisible; $i<$count; $i++) {
 			$this->getItem($i)
 				->addClass("notVisible")
 				->setProperty("style", "display: none;");
 		}
-		$item = $this->addItem("...");
+		$item=$this->addItem("...");
 		$item->addClass("points");
-		$item->onClick('$(this).hide();$("#' . $this->identifier . ' .notVisible").show();');
+		$item->onClick('$(this).hide();$("#'.$this->identifier.' .notVisible").show();');
 	}
 
 	public function onCkItemChange($jsCode) {
-		$this->_ckItemChange = $jsCode;
+		$this->_ckItemChange=$jsCode;
 	}
 
 	/**
@@ -126,7 +126,7 @@ 
 	 * @param boolean $fireOnInit
 	 */
 	public function setFireOnInit($fireOnInit) {
-		$this->_fireOnInit = $fireOnInit;
+		$this->_fireOnInit=$fireOnInit;
 	}
 
 	public function setRelaxed() {
@@ -150,15 +150,15 @@ 
 	 * {@inheritdoc}
 	 * @see \Ajax\common\html\HtmlCollection::compile()
 	 */
-	public function compile(JsUtils $js = NULL, &$view = NULL) {
-		if (isset($this->_maxVisible) && $this->_maxVisible < $this->count()) {
+	public function compile(JsUtils $js=NULL, &$view=NULL) {
+		if (isset($this->_maxVisible) && $this->_maxVisible<$this->count()) {
 			$this->addFollowPoints();
 			if (isset($js)) {
-				$visibility = new Visibility($js);
-				$visibility->attach("#" . $this->identifier);
+				$visibility=new Visibility($js);
+				$visibility->attach("#".$this->identifier);
 				$visibility->setOnTopVisible("$(this).children('.notVisible').hide();$(this).find('.points').show();");
 				$visibility->compile($js, $view);
-				$this->_visibility = $visibility;
+				$this->_visibility=$visibility;
 			}
 		}
 		return parent::compile($js, $view);
@@ -173,21 +173,21 @@ 
 	 * @param string $notAllChecked
 	 * @return HtmlList
 	 */
-	public function addCheckedList($items = array(), $masterItem = NULL, $values = array(), $notAllChecked = false, $name = null) {
-		$count = $this->count();
-		$identifier = $this->identifier . "-" . $count;
+	public function addCheckedList($items=array(), $masterItem=NULL, $values=array(), $notAllChecked=false, $name=null) {
+		$count=$this->count();
+		$identifier=$this->identifier."-".$count;
 		if (isset($masterItem)) {
 			if (\is_array($masterItem)) {
-				$masterO = new HtmlFormCheckbox("master-" . $identifier, @$masterItem[0], @$masterItem[1]);
+				$masterO=new HtmlFormCheckbox("master-".$identifier, @$masterItem[0], @$masterItem[1]);
 				if (isset($name))
 					$masterO->setName($name);
 				if (isset($masterItem[1])) {
-					if (\array_search($masterItem[1], $values) !== false) {
+					if (\array_search($masterItem[1], $values)!==false) {
 						$masterO->getDataField()->setProperty("checked", "");
 					}
 				}
 			} else {
-				$masterO = new HtmlFormCheckbox("master-" . $identifier, $masterItem);
+				$masterO=new HtmlFormCheckbox("master-".$identifier, $masterItem);
 			}
 			if ($notAllChecked) {
 				$masterO->getDataField()->addClass("_notAllChecked");
@@ -196,36 +196,36 @@ 
 			$masterO->setClass("item");
 			$this->addItem($masterO);
 		}
-		$fields = array();
-		$i = 0;
-		$this->setFireOnInit(UString::getBooleanStr($this->_fireOnInit || count($items) < 30));
+		$fields=array();
+		$i=0;
+		$this->setFireOnInit(UString::getBooleanStr($this->_fireOnInit || count($items)<30));
 		foreach ($items as $val => $caption) {
-			$itemO = new HtmlFormCheckbox($identifier . "-" . $i ++, $caption, $val, "child");
-			if (\array_search($val, $values) !== false) {
+			$itemO=new HtmlFormCheckbox($identifier."-".$i++, $caption, $val, "child");
+			if (\array_search($val, $values)!==false) {
 				$itemO->getDataField()->setProperty("checked", "");
 			}
 			if (isset($name))
 				$itemO->setName($name);
 			$itemO->setClass("item");
-			$fields[] = $itemO;
+			$fields[]=$itemO;
 		}
-		if (isset($masterO) === true) {
-			$list = new HtmlList("", $fields);
+		if (isset($masterO)===true) {
+			$list=new HtmlList("", $fields);
 			$list->setClass("list");
 			$masterO->addContent($list);
 		} else {
 			$this->addList($fields);
 		}
-		$this->_hasCheckedList = true;
+		$this->_hasCheckedList=true;
 		return $this;
 	}
 
 	public function setIcons($icons) {
-		if (! \is_array($icons)) {
-			$icons = \array_fill(0, \sizeof($this->content), $icons);
+		if (!\is_array($icons)) {
+			$icons=\array_fill(0, \sizeof($this->content), $icons);
 		}
-		$max = \min(\sizeof($icons), \sizeof($this->content));
-		for ($i = 0; $i < $max; $i ++) {
+		$max=\min(\sizeof($icons), \sizeof($this->content));
+		for ($i=0; $i<$max; $i++) {
 			$this->content[$i]->addIcon($icons[$i]);
 		}
 		return $this;
@@ -244,7 +244,7 @@ 
 	 * @param mixed $_maxVisible
 	 */
 	public function setMaxVisible($_maxVisible) {
-		$this->_maxVisible = $_maxVisible;
+		$this->_maxVisible=$_maxVisible;
 		return $this;
 	}
 }

Braces +9 added lines, -6 removed lines

@@ -72,8 +72,9 @@ 
 
 	protected function getItemToAdd($item) {
 		$itemO = parent::getItemToAdd($item);
-		if ($itemO instanceof AbstractCheckbox)
-			$itemO->addClass("item");
+		if ($itemO instanceof AbstractCheckbox) {
+					$itemO->addClass("item");
+		}
 		return $itemO;
 	}
 
@@ -179,8 +180,9 @@ 
 		if (isset($masterItem)) {
 			if (\is_array($masterItem)) {
 				$masterO = new HtmlFormCheckbox("master-" . $identifier, @$masterItem[0], @$masterItem[1]);
-				if (isset($name))
-					$masterO->setName($name);
+				if (isset($name)) {
+									$masterO->setName($name);
+				}
 				if (isset($masterItem[1])) {
 					if (\array_search($masterItem[1], $values) !== false) {
 						$masterO->getDataField()->setProperty("checked", "");
@@ -204,8 +206,9 @@ 
 			if (\array_search($val, $values) !== false) {
 				$itemO->getDataField()->setProperty("checked", "");
 			}
-			if (isset($name))
-				$itemO->setName($name);
+			if (isset($name)) {
+							$itemO->setName($name);
+			}
 			$itemO->setClass("item");
 			$fields[] = $itemO;
 		}