phpMv / phpMv-UI

Ajax/semantic/html/content/table/HtmlTableContent.php

Spacing +99 added lines, -99 removed lines

@@ -15,15 +15,15 @@ 
  */
 class HtmlTableContent extends HtmlSemCollection {
 
-	protected $_focusable = false;
+	protected $_focusable=false;
 
-	protected $_tdTagNames = [
+	protected $_tdTagNames=[
 		"thead" => "th",
 		"tbody" => "td",
 		"tfoot" => "th"
 	];
 
-	protected $_merged = false;
+	protected $_merged=false;
 
 	/**
 	 *
@@ -32,7 +32,7 @@ 
 	 * @param int $rowCount
 	 * @param int $colCount
 	 */
-	public function __construct($identifier, $tagName = "tbody", $rowCount = NULL, $colCount = NULL) {
+	public function __construct($identifier, $tagName="tbody", $rowCount=NULL, $colCount=NULL) {
 		parent::__construct($identifier, $tagName, "");
 		if (isset($rowCount) && isset($colCount))
 			$this->setRowCount($rowCount, $colCount);
@@ -45,8 +45,8 @@ 
 	 * @return HtmlTableContent
 	 */
 	public function setRowCount($rowCount, $colCount) {
-		$count = $this->count();
-		for ($i = $count; $i < $rowCount; $i ++) {
+		$count=$this->count();
+		for ($i=$count; $i<$rowCount; $i++) {
 			$this->addItem($colCount);
 		}
 		return $this;
@@ -57,7 +57,7 @@ 
 	}
 
 	public function refreshTR() {
-		$this->_template = "%wrapContentBefore%%content%%wrapContentAfter%";
+		$this->_template="%wrapContentBefore%%content%%wrapContentAfter%";
 	}
 
 	/**
@@ -68,14 +68,14 @@ 
 	 * @return HtmlTR
 	 */
 	protected function createItem($value) {
-		$count = $this->count();
-		$tr = new HtmlTR("");
+		$count=$this->count();
+		$tr=new HtmlTR("");
 		$tr->setContainer($this, $count);
 		if ($this->_focusable) {
 			$tr->setProperty('tabindex', $count);
 		}
 		$tr->setTdTagName($this->_tdTagNames[$this->tagName]);
-		if (isset($value) === true) {
+		if (isset($value)===true) {
 			$tr->setColCount($value);
 		}
 		return $tr;
@@ -103,8 +103,8 @@ 
 		return $this->addItem($row);
 	}
 
-	public function addMergeRow($colCount, $value = null) {
-		$row = $this->addRow($colCount);
+	public function addMergeRow($colCount, $value=null) {
+		$row=$this->addRow($colCount);
 		$row->mergeCol();
 		if (isset($value)) {
 			$row->setValues([
@@ -130,11 +130,11 @@ 
 	 * @return HtmlTD|HtmlDoubleElement
 	 */
 	public function getCell($row, $col) {
-		$row = $this->getItem($row);
+		$row=$this->getItem($row);
 		if (isset($row) && $row instanceof HtmlCollection) {
-			$col = $row->getItem($col);
+			$col=$row->getItem($col);
 		} else {
-			$col = $row;
+			$col=$row;
 		}
 		return $col;
 	}
@@ -155,9 +155,9 @@ 
 	 * @param mixed $value
 	 * @return HtmlTableContent
 	 */
-	public function setCellValue($row, $col, $value = "") {
-		$cell = $this->getCell($row, $col);
-		if (isset($cell) === true) {
+	public function setCellValue($row, $col, $value="") {
+		$cell=$this->getCell($row, $col);
+		if (isset($cell)===true) {
 			$cell->setValue($value);
 		}
 		return $this;
@@ -168,8 +168,8 @@ 
 	 *
 	 * @param mixed $values
 	 */
-	public function setValues($values = array()) {
-		return $this->_addOrSetValues($values, function (HtmlTR $row, $_values) {
+	public function setValues($values=array()) {
+		return $this->_addOrSetValues($values, function(HtmlTR $row, $_values) {
 			$row->setValues($_values);
 		});
 	}
@@ -179,8 +179,8 @@ 
 	 *
 	 * @param mixed $values
 	 */
-	public function addValues($values = array()) {
-		return $this->_addOrSetValues($values, function (HtmlTR $row, $_values) {
+	public function addValues($values=array()) {
+		return $this->_addOrSetValues($values, function(HtmlTR $row, $_values) {
 			$row->addValues($_values);
 		});
 	}
@@ -192,42 +192,42 @@ 
 	 * @param callable $callback
 	 */
 	protected function _addOrSetValues($values, $callback) {
-		$count = $this->count();
-		$isArray = true;
-		if (! \is_array($values)) {
-			$values = \array_fill(0, $count, $values);
-			$isArray = false;
+		$count=$this->count();
+		$isArray=true;
+		if (!\is_array($values)) {
+			$values=\array_fill(0, $count, $values);
+			$isArray=false;
 		}
-		if (JArray::dimension($values) == 1 && $isArray)
-			$values = [
+		if (JArray::dimension($values)==1 && $isArray)
+			$values=[
 				$values
 			];
 
-		$count = \min(\sizeof($values), $count);
+		$count=\min(\sizeof($values), $count);
 
-		for ($i = 0; $i < $count; $i ++) {
-			$row = $this->content[$i];
+		for ($i=0; $i<$count; $i++) {
+			$row=$this->content[$i];
 			$callback($row, $values[$i]);
 		}
 		return $this;
 	}
 
-	public function setColValues($colIndex, $values = array()) {
-		$count = $this->count();
-		if (! \is_array($values)) {
-			$values = \array_fill(0, $count, $values);
+	public function setColValues($colIndex, $values=array()) {
+		$count=$this->count();
+		if (!\is_array($values)) {
+			$values=\array_fill(0, $count, $values);
 		}
-		$count = \min(\sizeof($values), $count);
-		for ($i = 0; $i < $count; $i ++) {
+		$count=\min(\sizeof($values), $count);
+		for ($i=0; $i<$count; $i++) {
 			$this->getCell($i, $colIndex)->setValue($values[$i]);
 		}
 		return $this;
 	}
 
-	public function addColVariations($colIndex, $variations = array()) {
-		$count = $this->count();
-		for ($i = 0; $i < $count; $i ++) {
-			$cell = $this->getCell($i, $colIndex);
+	public function addColVariations($colIndex, $variations=array()) {
+		$count=$this->count();
+		for ($i=0; $i<$count; $i++) {
+			$cell=$this->getCell($i, $colIndex);
 			if ($cell instanceof BaseTrait)
 				$cell->addVariations($variations);
 		}
@@ -235,31 +235,31 @@ 
 	}
 
 	public function addPropertyCol($colIndex, $name, $value) {
-		$count = $this->count();
-		for ($i = 0; $i < $count; $i ++) {
-			$cell = $this->getCell($i, $colIndex);
+		$count=$this->count();
+		for ($i=0; $i<$count; $i++) {
+			$cell=$this->getCell($i, $colIndex);
 			if (isset($cell))
 				$cell->addToProperty($name, $value);
 		}
 		return $this;
 	}
 
-	public function setRowValues($rowIndex, $values = array()) {
-		$count = $this->count();
-		if (! \is_array($values)) {
-			$values = \array_fill(0, $count, $values);
+	public function setRowValues($rowIndex, $values=array()) {
+		$count=$this->count();
+		if (!\is_array($values)) {
+			$values=\array_fill(0, $count, $values);
 		}
 		$this->getItem($rowIndex)->setValues($values);
 		return $this;
 	}
 
 	private function colAlign($colIndex, $function) {
-		$count = $this->count();
-		for ($i = 0; $i < $count; $i ++) {
-			$index = $this->content[$i]->getColPosition($colIndex);
-			if ($index !== NULL) {
-				$cell = $this->getCell($i, $index);
-				if ($cell != NULL) {
+		$count=$this->count();
+		for ($i=0; $i<$count; $i++) {
+			$index=$this->content[$i]->getColPosition($colIndex);
+			if ($index!==NULL) {
+				$cell=$this->getCell($i, $index);
+				if ($cell!=NULL) {
 					$cell->$function();
 				}
 			}
@@ -268,12 +268,12 @@ 
 	}
 
 	private function colAlignFromRight($colIndex, $function) {
-		$count = $this->count();
-		for ($i = 0; $i < $count; $i ++) {
-			$maxRow = $this->content[$i]->count();
-			$index = $maxRow - $colIndex - 1;
-			if (($cell = $this->getCell($i, $index)) !== NULL) {
-				if ($cell->getColspan() == 1)
+		$count=$this->count();
+		for ($i=0; $i<$count; $i++) {
+			$maxRow=$this->content[$i]->count();
+			$index=$maxRow-$colIndex-1;
+			if (($cell=$this->getCell($i, $index))!==NULL) {
+				if ($cell->getColspan()==1)
 					$cell->$function();
 			}
 		}
@@ -319,9 +319,9 @@ 
 	 * @return int
 	 */
 	public function getColCount() {
-		$result = 0;
-		if ($this->count() > 0)
-			$result = $this->getItem(0)->count();
+		$result=0;
+		if ($this->count()>0)
+			$result=$this->getItem(0)->count();
 		return $result;
 	}
 
@@ -332,10 +332,10 @@ 
 	 * @param int $colIndex
 	 * @return HtmlTableContent
 	 */
-	public function delete($rowIndex, $colIndex = NULL) {
+	public function delete($rowIndex, $colIndex=NULL) {
 		if (isset($colIndex)) {
-			$row = $this->getItem($rowIndex);
-			if (isset($row) === true) {
+			$row=$this->getItem($rowIndex);
+			if (isset($row)===true) {
 				$row->delete($colIndex);
 			}
 		} else {
@@ -345,24 +345,24 @@ 
 	}
 
 	public function toDelete($rowIndex, $colIndex) {
-		$row = $this->getItem($rowIndex);
-		if (isset($row) === true)
+		$row=$this->getItem($rowIndex);
+		if (isset($row)===true)
 			$row->toDelete($colIndex);
 		return $this;
 	}
 
 	public function toRowspanned($rowIndex, $colIndex) {
-		$row = $this->getItem($rowIndex);
-		if (isset($row) === true)
+		$row=$this->getItem($rowIndex);
+		if (isset($row)===true)
 			$row->toRowspanned($colIndex);
 		return $this;
 	}
 
-	public function mergeCol($rowIndex = 0, $colIndex = 0) {
+	public function mergeCol($rowIndex=0, $colIndex=0) {
 		return $this->getItem($rowIndex)->mergeCol($colIndex);
 	}
 
-	public function mergeRow($rowIndex = 0, $colIndex = 0) {
+	public function mergeRow($rowIndex=0, $colIndex=0) {
 		return $this->getItem($rowIndex)->mergeRow($colIndex);
 	}
 
@@ -382,7 +382,7 @@ 
 	 * @return HtmlTableContent
 	 */
 	public function conditionalCellFormat($callback, $format) {
-		$rows = $this->content;
+		$rows=$this->content;
 		foreach ($rows as $row) {
 			$row->conditionalCellFormat($callback, $format);
 		}
@@ -390,9 +390,9 @@ 
 	}
 
 	public function conditionalColFormat($colIndex, $callback, $format) {
-		$rows = $this->content;
+		$rows=$this->content;
 		foreach ($rows as $row) {
-			$cell = $row->getItem($colIndex);
+			$cell=$row->getItem($colIndex);
 			$cell->conditionnalCellFormat($callback, $format);
 		}
 		return $this;
@@ -405,7 +405,7 @@ 
 	 * @return HtmlTableContent
 	 */
 	public function conditionalRowFormat($callback, $format) {
-		$rows = $this->content;
+		$rows=$this->content;
 		foreach ($rows as $row) {
 			$row->conditionalRowFormat($callback, $format);
 		}
@@ -413,9 +413,9 @@ 
 	}
 
 	public function hideColumn($colIndex) {
-		$rows = $this->content;
+		$rows=$this->content;
 		foreach ($rows as $row) {
-			$cell = $row->getItem($colIndex);
+			$cell=$row->getItem($colIndex);
 			$cell->addToProperty("style", "display:none;");
 		}
 		return $this;
@@ -427,7 +427,7 @@ 
 	 * @return HtmlTableContent
 	 */
 	public function applyCells($callback) {
-		$rows = $this->content;
+		$rows=$this->content;
 		foreach ($rows as $row) {
 			$row->applyCells($callback);
 		}
@@ -440,7 +440,7 @@ 
 	 * @return HtmlTableContent
 	 */
 	public function applyRows($callback) {
-		$rows = $this->content;
+		$rows=$this->content;
 		foreach ($rows as $row) {
 			$row->apply($callback);
 		}
@@ -455,28 +455,28 @@ 
 	 * @see https://fomantic-ui.com/collections/table.html#definition needs rowspanned class
 	 * @since fomantic-ui 2.4.8
 	 */
-	public function mergeIdentiqualValues($colIndex, $function = "strip_tags") {
-		$rows = $this->content;
-		$identiqual = null;
-		$counter = 0;
-		$cellToMerge = null;
-		$functionExists = \function_exists($function);
+	public function mergeIdentiqualValues($colIndex, $function="strip_tags") {
+		$rows=$this->content;
+		$identiqual=null;
+		$counter=0;
+		$cellToMerge=null;
+		$functionExists=\function_exists($function);
 		foreach ($rows as $row) {
-			$cell = $row->getItem($colIndex);
-			$value = $cell->getContent();
+			$cell=$row->getItem($colIndex);
+			$value=$cell->getContent();
 			if ($functionExists)
-				$value = \call_user_func($function, $value);
-			if ($value !== $identiqual) {
-				if ($counter > 0 && isset($cellToMerge)) {
+				$value=\call_user_func($function, $value);
+			if ($value!==$identiqual) {
+				if ($counter>0 && isset($cellToMerge)) {
 					$cellToMerge->setRowspanned($counter);
 				}
-				$counter = 0;
-				$cellToMerge = $cell;
-				$identiqual = $value;
+				$counter=0;
+				$cellToMerge=$cell;
+				$identiqual=$value;
 			}
-			$counter ++;
+			$counter++;
 		}
-		if ($counter > 0 && isset($cellToMerge)) {
+		if ($counter>0 && isset($cellToMerge)) {
 			$cellToMerge->setRowspanned($counter);
 		}
 		return $this;
@@ -487,7 +487,7 @@ 
 	}
 
 	public function _setMerged($value) {
-		$this->_merged = $value;
+		$this->_merged=$value;
 		return $this;
 	}
 
@@ -496,6 +496,6 @@ 
 	 * @param bool $focusable
 	 */
 	public function setFocusable(bool $focusable): void {
-		$this->_focusable = $focusable;
+		$this->_focusable=$focusable;
 	}
 }

Braces +27 added lines, -18 removed lines

@@ -34,8 +34,9 @@ 
 	 */
 	public function __construct($identifier, $tagName = "tbody", $rowCount = NULL, $colCount = NULL) {
 		parent::__construct($identifier, $tagName, "");
-		if (isset($rowCount) && isset($colCount))
-			$this->setRowCount($rowCount, $colCount);
+		if (isset($rowCount) && isset($colCount)) {
+					$this->setRowCount($rowCount, $colCount);
+		}
 	}
 
 	/**
@@ -198,10 +199,11 @@ 
 			$values = \array_fill(0, $count, $values);
 			$isArray = false;
 		}
-		if (JArray::dimension($values) == 1 && $isArray)
-			$values = [
+		if (JArray::dimension($values) == 1 && $isArray) {
+					$values = [
 				$values
 			];
+		}
 
 		$count = \min(\sizeof($values), $count);
 
@@ -228,8 +230,9 @@ 
 		$count = $this->count();
 		for ($i = 0; $i < $count; $i ++) {
 			$cell = $this->getCell($i, $colIndex);
-			if ($cell instanceof BaseTrait)
-				$cell->addVariations($variations);
+			if ($cell instanceof BaseTrait) {
+							$cell->addVariations($variations);
+			}
 		}
 		return $this;
 	}
@@ -238,8 +241,9 @@ 
 		$count = $this->count();
 		for ($i = 0; $i < $count; $i ++) {
 			$cell = $this->getCell($i, $colIndex);
-			if (isset($cell))
-				$cell->addToProperty($name, $value);
+			if (isset($cell)) {
+							$cell->addToProperty($name, $value);
+			}
 		}
 		return $this;
 	}
@@ -273,8 +277,9 @@ 
 			$maxRow = $this->content[$i]->count();
 			$index = $maxRow - $colIndex - 1;
 			if (($cell = $this->getCell($i, $index)) !== NULL) {
-				if ($cell->getColspan() == 1)
-					$cell->$function();
+				if ($cell->getColspan() == 1) {
+									$cell->$function();
+				}
 			}
 		}
 		return $this;
@@ -320,8 +325,9 @@ 
 	 */
 	public function getColCount() {
 		$result = 0;
-		if ($this->count() > 0)
-			$result = $this->getItem(0)->count();
+		if ($this->count() > 0) {
+					$result = $this->getItem(0)->count();
+		}
 		return $result;
 	}
 
@@ -346,15 +352,17 @@ 
 
 	public function toDelete($rowIndex, $colIndex) {
 		$row = $this->getItem($rowIndex);
-		if (isset($row) === true)
-			$row->toDelete($colIndex);
+		if (isset($row) === true) {
+					$row->toDelete($colIndex);
+		}
 		return $this;
 	}
 
 	public function toRowspanned($rowIndex, $colIndex) {
 		$row = $this->getItem($rowIndex);
-		if (isset($row) === true)
-			$row->toRowspanned($colIndex);
+		if (isset($row) === true) {
+					$row->toRowspanned($colIndex);
+		}
 		return $this;
 	}
 
@@ -464,8 +472,9 @@ 
 		foreach ($rows as $row) {
 			$cell = $row->getItem($colIndex);
 			$value = $cell->getContent();
-			if ($functionExists)
-				$value = \call_user_func($function, $value);
+			if ($functionExists) {
+							$value = \call_user_func($function, $value);
+			}
 			if ($value !== $identiqual) {
 				if ($counter > 0 && isset($cellToMerge)) {
 					$cellToMerge->setRowspanned($counter);

Ajax/common/traits/JsUtilsAjaxTrait.php

Braces +17 added lines, -12 removed lines

@@ -161,10 +161,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"]) {
@@ -198,8 +199,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);
 		}
@@ -223,8 +225,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);
 	}
@@ -258,8 +261,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;
+			}
 		}
 	}
 
@@ -833,8 +837,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 +228 added lines, -228 removed lines

@@ -15,79 +15,79 @@ 
 
 	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 .= "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.="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 .= "let 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.="let xhr = $.ajaxSettings.xhr();function xhrProvider() {return xhr;};xhr.onreadystatechange = function (e) { if (3==e.target.readyState){let response=e.target.responseText;".$partial.";}; };";
 		} elseif (isset($upload)) {
-			$ajaxParameters["xhr"] = "xhrProvider";
-			$retour .= 'let xhr = $.ajaxSettings.xhr();function xhrProvider() {return xhr;};xhr.upload.addEventListener("progress", function(event) {if (event.lengthComputable) {' . $upload . '}}, false);';
+			$ajaxParameters["xhr"]="xhrProvider";
+			$retour.='let xhr = $.ajaxSettings.xhr();function xhrProvider() {return xhr;};xhr.upload.addEventListener("progress", function(event) {if (event.lengthComputable) {'.$upload.'}}, false);';
 		}
 		$this->createAjaxParameters($ajaxParameters, $parameters);
-		$retour .= "$.ajax({" . $this->implodeAjaxParameters($ajaxParameters) . "}).done(function( data, textStatus, jqXHR ) {\n";
-		$retour .= $this->_getOnAjaxDone($responseElement, $jqueryDone, $ajaxTransition, $jsCallback, ($historize ? $originalSelector : null)) . "})";
+		$retour.="$.ajax({".$this->implodeAjaxParameters($ajaxParameters)."}).done(function( data, textStatus, jqXHR ) {\n";
+		$retour.=$this->_getOnAjaxDone($responseElement, $jqueryDone, $ajaxTransition, $jsCallback, ($historize ? $originalSelector : null))."})";
 		if (isset($error)) {
-			$retour .= '.fail(function( jqXHR, textStatus, errorThrown ){' . $error . '})';
+			$retour.='.fail(function( jqXHR, textStatus, errorThrown ){'.$error.'})';
 		}
-		$retour .= '.always(function( dataOrjqXHR, textStatus, jqXHROrerrorThrown ) {' . ($always ?? '') . $this->removeLoader($hasLoader) . '})';
-		$retour .= ";\n";
-		$retour = $this->_addJsCondition($jsCondition, $retour);
+		$retour.='.always(function( dataOrjqXHR, textStatus, jqXHROrerrorThrown ) {'.($always ?? '').$this->removeLoader($hasLoader).'})';
+		$retour.=";\n";
+		$retour=$this->_addJsCondition($jsCondition, $retour);
 		if ($immediatly) {
-			$this->jquery_code_for_compile[] = $retour;
+			$this->jquery_code_for_compile[]=$retour;
 		}
 		return $retour;
 	}
 
 	protected function createAjaxParameters(&$original, $parameters) {
-		$validParameters = [
+		$validParameters=[
 			"contentType" => "%value%",
 			"dataType" => "'%value%'",
 			"beforeSend" => "function(jqXHR,settings){%value%}",
@@ -96,21 +96,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;
@@ -118,29 +118,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=!(new RegExp('^((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=!(new RegExp('^((http|https|ftp):\/\/)')).test(elmUrl)?url+'".$slash."'+elmUrl:elmUrl;\n";
 			}
 		}
 		return $retour;
@@ -150,44 +150,44 @@ 
 		return "window.onpopstate = function(e){if(e.state){let target=e.state.jqueryDone;$(e.state.selector)[target](e.state.html);}};";
 	}
 
-	protected function autoActiveLinks($previousURL = "window.location.href") {
-		$result = "\nif (typeof getHref !== 'function'){function getHref(url) { return \$('a').filter(function(){return \$(this).prop('href') == url; });}}";
-		$result .= "\nlet 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="\nif (typeof getHref !== 'function'){function getHref(url) { return \$('a').filter(function(){return \$(this).prop('href') == url; });}}";
+		$result.="\nlet 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, $history = null) {
-		$retour = "";
-		$call = null;
+	protected function _getOnAjaxDone($responseElement, $jqueryDone, $ajaxTransition, $jsCallback, $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);";
 		}
-		$retour .= "\t" . $jsCallback . "\n";
+		$retour.="\t".$jsCallback."\n";
 		return $retour;
 	}
 
 	protected function removeLoader($hasLoader) {
-		if ($hasLoader === true) {
+		if ($hasLoader===true) {
 			return "\n$('body').find('.ajax-loader').remove();";
 		}
-		if ($hasLoader === 'internal') {
+		if ($hasLoader==='internal') {
 			return "\n$(self).removeClass('loading');";
 		}
-		if ($hasLoader === 'internal-x') {
+		if ($hasLoader==='internal-x') {
 			return "\n$(self).children('.ajax-loader').remove();";
 		}
 		return "\n$('body').find('.loading').removeClass('loading');";
@@ -195,71 +195,71 @@ 
 
 	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);
 			};
 		}
@@ -268,13 +268,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;
 	}
 
 	/**
@@ -285,7 +285,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);
 	}
 
@@ -299,8 +299,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);
 	}
 
@@ -316,8 +316,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);
 	}
 
@@ -339,7 +339,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);
 	}
 
@@ -355,8 +355,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);
 	}
 
@@ -370,15 +370,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);
 	}
 
@@ -392,7 +392,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);
 	}
 
@@ -408,7 +408,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,
@@ -428,8 +428,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);
 	}
 
@@ -444,29 +444,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" . "\tlet created=false;let maskElm=$('" . $maskSelector . "').first();maskElm.hide();" . "\tlet newId=(maskElm.attr('id') || 'mask')+'-'+index;" . "\tlet 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"."\tlet created=false;let maskElm=$('".$maskSelector."').first();maskElm.hide();"."\tlet newId=(maskElm.attr('id') || 'mask')+'-'+index;"."\tlet 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(){ let 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\tlet 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\tlet sel='[data-id=\"'+key+'\"]';if($(sel,newElm).length){\n" . "\t\t\tlet 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\tlet 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\tlet sel='[data-id=\"'+key+'\"]';if($(sel,newElm).length){\n"."\t\t\tlet 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);
 	}
 
@@ -481,7 +481,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);
 	}
 
@@ -496,8 +496,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);
 	}
 
@@ -513,7 +513,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,
@@ -534,8 +534,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);
 	}
 
@@ -554,8 +554,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);
 	}
 
@@ -574,7 +574,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,
@@ -598,7 +598,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);
 	}
 
@@ -615,7 +615,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);
 	}
 
@@ -630,18 +630,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'] = 'let event = jQuery.Event( "getHref" );event.url = url;$(self).trigger(event);';
+		if (!isset($parameters['jsCallback'])) {
+			$parameters['jsCallback']='let event = jQuery.Event( "getHref" );event.url = url;$(self).trigger(event);';
 		}
 		return $this->getOnClick($element, "", $responseElement, $parameters);
 	}
@@ -657,15 +657,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);
 	}
@@ -681,29 +681,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'] = 'let event = jQuery.Event( "postFormAction" );event.params = Object.fromEntries(new URLSearchParams(params));$(self).trigger(event);';
+		if (!isset($parameters['jsCallback'])) {
+			$parameters['jsCallback']='let 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);
 	}
 
@@ -719,8 +719,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);
 	}
 
@@ -737,8 +737,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);
 	}
 
@@ -757,9 +757,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);
 	}
 
@@ -777,75 +777,75 @@ 
 	 * @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 .= "\nlet 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.="\nlet params=$('#'+".$form.").serialize();\n";
 			if (isset($params)) {
-				$retour .= "params+='&'+" . self::_correctParams($params) . ";\n";
+				$retour.="params+='&'+".self::_correctParams($params).";\n";
 			}
 		} else {
-			$retour .= "\nlet params=new FormData($('#'+" . $form . ")[0]);\n";
+			$retour.="\nlet params=new FormData($('#'+".$form.")[0]);\n";
 		}
-		$responseElement = $this->_getResponseElement($responseElement);
-		$retour .= "let self=this;\n";
-		$before = isset($before) ? $before : "";
-		$retour .= $before;
-		if ($hasLoader === true) {
+		$responseElement=$this->_getResponseElement($responseElement);
+		$retour.="let 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 .= "let 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.="let 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) . "})";
+		$retour.="$.ajax({".$this->implodeAjaxParameters($ajaxParameters)."}).done(function( data ) {\n";
+		$retour.=$this->_getOnAjaxDone($responseElement, $jqueryDone, $ajaxTransition, $jsCallback)."})";
 		if (isset($error)) {
-			$retour .= '.fail(function( jqXHR, textStatus, errorThrown ){' . $error . '})';
+			$retour.='.fail(function( jqXHR, textStatus, errorThrown ){'.$error.'})';
 		}
-		$retour .= '.always(function( dataOrjqXHR, textStatus, jqXHROrerrorThrown ) {' . ($always ?? '') . $this->removeLoader($hasLoader) . '})';
-		$retour .= ";\n";
+		$retour.='.always(function( dataOrjqXHR, textStatus, jqXHROrerrorThrown ) {'.($always ?? '').$this->removeLoader($hasLoader).'})';
+		$retour.=";\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;
 	}
 
@@ -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 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);
 	}
 
@@ -879,8 +879,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);
 	}
 
@@ -897,7 +897,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,
@@ -919,11 +919,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/html/collections/form/HtmlFormInput.php

Spacing +20 added lines, -20 removed lines

@@ -7,23 +7,23 @@ 
 class HtmlFormInput extends HtmlFormField {
 	use TextFieldsTrait;
 
-	const TOGGLE_CLICK = 0;
+	const TOGGLE_CLICK=0;
 
-	const TOGGLE_MOUSEDOWN = 1;
+	const TOGGLE_MOUSEDOWN=1;
 
-	const TOGGLE_INTERVAL = 2;
+	const TOGGLE_INTERVAL=2;
 
-	public function __construct($identifier, $label = NULL, $type = "text", $value = NULL, $placeholder = NULL) {
-		if (! isset($placeholder) && $type === "text")
-			$placeholder = $label;
-		parent::__construct("field-" . $identifier, new HtmlInput($identifier, $type, $value, $placeholder), $label);
-		$this->_identifier = $identifier;
+	public function __construct($identifier, $label=NULL, $type="text", $value=NULL, $placeholder=NULL) {
+		if (!isset($placeholder) && $type==="text")
+			$placeholder=$label;
+		parent::__construct("field-".$identifier, new HtmlInput($identifier, $type, $value, $placeholder), $label);
+		$this->_identifier=$identifier;
 	}
 
 	public function getDataField() {
-		$field = $this->getField();
+		$field=$this->getField();
 		if ($field instanceof HtmlInput)
-			$field = $field->getDataField();
+			$field=$field->getDataField();
 		return $field;
 	}
 
@@ -32,9 +32,9 @@ 
 	 *
 	 * @param string $keyIcon
 	 */
-	public function asPassword($keyIcon = 'key') {
+	public function asPassword($keyIcon='key') {
 		$this->setInputType('password');
-		if ($keyIcon != '') {
+		if ($keyIcon!='') {
 			$this->addIcon($keyIcon);
 		}
 	}
@@ -49,28 +49,28 @@ 
 	 *        	one of TOGGLE_CLICK, TOGGLE_MOUSEDOWN, TOGGLE_INTERVAL
 	 * @return mixed|\Ajax\semantic\html\elements\HtmlButton
 	 */
-	public function addTogglePasswordAction($buttonIcon = 'eye', $keyIcon = 'key', $slashIcon = 'slash', $type = 0) {
+	public function addTogglePasswordAction($buttonIcon='eye', $keyIcon='key', $slashIcon='slash', $type=0) {
 		$this->asPassword($keyIcon);
-		$action = $this->addAction('see');
+		$action=$this->addAction('see');
 		$action->asIcon($buttonIcon);
 		switch ($type) {
 			case self::TOGGLE_CLICK:
-				$action->onClick('let th=$(this);' . $this->getJsToggle($slashIcon, '(_,attr)=>(attr=="text")?"password":"text"', 'toggle'));
+				$action->onClick('let th=$(this);'.$this->getJsToggle($slashIcon, '(_,attr)=>(attr=="text")?"password":"text"', 'toggle'));
 				break;
 			case self::TOGGLE_MOUSEDOWN:
 				$action->onClick('');
-				$action->addEvent('mousedown', 'let th=$(this);' . $this->getJsToggle($slashIcon, '"text"', 'add'));
-				$action->addEvent('mouseup', 'let th=$(this);' . $this->getJsToggle($slashIcon, '"password"', 'remove'));
-				$action->addEvent('mouseout', 'let th=$(this);' . $this->getJsToggle($slashIcon, '"password"', 'remove'));
+				$action->addEvent('mousedown', 'let th=$(this);'.$this->getJsToggle($slashIcon, '"text"', 'add'));
+				$action->addEvent('mouseup', 'let th=$(this);'.$this->getJsToggle($slashIcon, '"password"', 'remove'));
+				$action->addEvent('mouseout', 'let th=$(this);'.$this->getJsToggle($slashIcon, '"password"', 'remove'));
 				break;
 			case self::TOGGLE_INTERVAL:
-				$action->onClick('let th=$(this);' . $this->getJsToggle($slashIcon, '"text"', 'add') . 'setTimeout(function(){ ' . $this->getJsToggle($slashIcon, '"password"', 'remove') . ' }, 5000);');
+				$action->onClick('let th=$(this);'.$this->getJsToggle($slashIcon, '"text"', 'add').'setTimeout(function(){ '.$this->getJsToggle($slashIcon, '"password"', 'remove').' }, 5000);');
 				break;
 		}
 		return $action;
 	}
 
 	private function getJsToggle($slashIcon, $type, $actionClass) {
-		return 'th.find(".icon").' . $actionClass . 'Class("' . $slashIcon . '");th.closest(".field").find("input").attr("type",' . $type . ');';
+		return 'th.find(".icon").'.$actionClass.'Class("'.$slashIcon.'");th.closest(".field").find("input").attr("type",'.$type.');';
 	}
 }

Braces +6 added lines, -4 removed lines

@@ -14,16 +14,18 @@
 	const TOGGLE_INTERVAL = 2;
 
 	public function __construct($identifier, $label = NULL, $type = "text", $value = NULL, $placeholder = NULL) {
-		if (! isset($placeholder) && $type === "text")
-			$placeholder = $label;
+		if (! isset($placeholder) && $type === "text") {
+					$placeholder = $label;
+		}
 		parent::__construct("field-" . $identifier, new HtmlInput($identifier, $type, $value, $placeholder), $label);
 		$this->_identifier = $identifier;
 	}
 
 	public function getDataField() {
 		$field = $this->getField();
-		if ($field instanceof HtmlInput)
-			$field = $field->getDataField();
+		if ($field instanceof HtmlInput) {
+					$field = $field->getDataField();
+		}
 		return $field;
 	}
 

Ajax/common/html/BaseHtml.php

Braces +12 added lines, -8 removed lines

@@ -112,15 +112,18 @@ 
 			$flag = false;
 			$index = 0;
 			while (! $flag && $index < sizeof($elements)) {
-				if ($elements[$index] instanceof BaseHtml)
-					$flag = ($callback($elements[$index]));
+				if ($elements[$index] instanceof BaseHtml) {
+									$flag = ($callback($elements[$index]));
+				}
 				$index ++;
 			}
-			if ($flag === true)
-				return $elements[$index - 1];
+			if ($flag === true) {
+							return $elements[$index - 1];
+			}
 		} elseif ($elements instanceof BaseHtml) {
-			if ($callback($elements))
-				return $elements;
+			if ($callback($elements)) {
+							return $elements;
+			}
 		}
 		return null;
 	}
@@ -146,8 +149,9 @@ 
 
 	public function fromArray($array) {
 		foreach ($this as $key => $value) {
-			if (array_key_exists($key, $array) === true)
-				$this->_callSetter("set" . ucfirst($key), $key, $array[$key], $array);
+			if (array_key_exists($key, $array) === true) {
+							$this->_callSetter("set" . ucfirst($key), $key, $array[$key], $array);
+			}
 		}
 		foreach ($array as $key => $value) {
 			if ($this->_callSetter($key, $key, $value, $array) === false) {

Spacing +77 added lines, -77 removed lines

@@ -15,21 +15,21 @@ 
  * @version 1.3.3
  */
 abstract class BaseHtml extends BaseWidget {
-	use BaseHtmlEventsTrait,BaseHtmlPropertiesTrait;
+	use BaseHtmlEventsTrait, BaseHtmlPropertiesTrait;
 
 	protected $_template;
 
 	protected $tagName;
 
-	protected $_wrapBefore = array();
+	protected $_wrapBefore=array();
 
-	protected $_wrapAfter = array();
+	protected $_wrapAfter=array();
 
 	protected $_bsComponent;
 
-	protected $_compiled = false;
+	protected $_compiled=false;
 
-	protected $_runned = false;
+	protected $_runned=false;
 
 	protected $_postCompile;
 
@@ -43,31 +43,31 @@ 
 	abstract public function run(JsUtils $js);
 
 	private function _callSetter($setter, $key, $value, &$array) {
-		$result = false;
-		if (method_exists($this, $setter) && substr($setter, 0, 1) !== "_") {
+		$result=false;
+		if (method_exists($this, $setter) && substr($setter, 0, 1)!=="_") {
 			try {
 				$this->$setter($value);
 				unset($array[$key]);
-				$result = true;
-			} catch (\Exception $e) {
-				$result = false;
+				$result=true;
+			}catch (\Exception $e) {
+				$result=false;
 			}
 		}
 		return $result;
 	}
 
-	protected function getTemplate(JsUtils $js = NULL, $view = null) {
-		return PropertyWrapper::wrap($this->_wrapBefore, $js, $view) . $this->_template . PropertyWrapper::wrap($this->_wrapAfter, $js, $view);
+	protected function getTemplate(JsUtils $js=NULL, $view=null) {
+		return PropertyWrapper::wrap($this->_wrapBefore, $js, $view).$this->_template.PropertyWrapper::wrap($this->_wrapAfter, $js, $view);
 	}
 
 	protected function ctrl($name, $value, $typeCtrl) {
 		if (\is_array($typeCtrl)) {
-			if (array_search($value, $typeCtrl) === false) {
-				throw new \Exception("La valeur passée `" . $value . "` à la propriété `" . $name . "` ne fait pas partie des valeurs possibles : {" . implode(",", $typeCtrl) . "}");
+			if (array_search($value, $typeCtrl)===false) {
+				throw new \Exception("La valeur passée `".$value."` à la propriété `".$name."` ne fait pas partie des valeurs possibles : {".implode(",", $typeCtrl)."}");
 			}
 		} else {
-			if (! $typeCtrl($value)) {
-				throw new \Exception("La fonction " . $typeCtrl . " a retourné faux pour l'affectation de la propriété " . $name);
+			if (!$typeCtrl($value)) {
+				throw new \Exception("La fonction ".$typeCtrl." a retourné faux pour l'affectation de la propriété ".$name);
 			}
 		}
 		return true;
@@ -75,49 +75,49 @@ 
 
 	protected function setMemberCtrl(&$name, $value, $typeCtrl) {
 		$this->ctrl($name, $value, $typeCtrl);
-		$name = $value;
+		$name=$value;
 		return $this;
 	}
 
-	protected function addToMemberUnique(&$name, $value, $typeCtrl, $separator = " ") {
+	protected function addToMemberUnique(&$name, $value, $typeCtrl, $separator=" ") {
 		if (\is_array($typeCtrl)) {
 			$this->removeOldValues($name, $typeCtrl);
-			$name .= $separator . $value;
+			$name.=$separator.$value;
 		}
 		return $this;
 	}
 
-	protected function addToMemberCtrl(&$name, $value, $typeCtrl, $separator = " ") {
+	protected function addToMemberCtrl(&$name, $value, $typeCtrl, $separator=" ") {
 		$this->ctrl($name, $value, $typeCtrl);
 		if (\is_array($typeCtrl)) {
 			$this->removeOldValues($name, $typeCtrl);
 		}
-		$name .= $separator . $value;
+		$name.=$separator.$value;
 		return $this;
 	}
 
-	protected function addToMember(&$name, $value, $separator = ' ') {
-		$name = \str_ireplace($value, '', $name??'') . $separator . $value;
+	protected function addToMember(&$name, $value, $separator=' ') {
+		$name=\str_ireplace($value, '', $name ?? '').$separator.$value;
 		return $this;
 	}
 
 	protected function removeOldValues(&$oldValue, $allValues) {
-		$oldValue = \str_ireplace($allValues, '', $oldValue??'');
-		$oldValue = \trim($oldValue);
+		$oldValue=\str_ireplace($allValues, '', $oldValue ?? '');
+		$oldValue=\trim($oldValue);
 	}
 
 	protected function _getElementBy($callback, $elements) {
 		if (\is_array($elements)) {
-			$elements = \array_values($elements);
-			$flag = false;
-			$index = 0;
-			while (! $flag && $index < sizeof($elements)) {
+			$elements=\array_values($elements);
+			$flag=false;
+			$index=0;
+			while (!$flag && $index<sizeof($elements)) {
 				if ($elements[$index] instanceof BaseHtml)
-					$flag = ($callback($elements[$index]));
-				$index ++;
+					$flag=($callback($elements[$index]));
+				$index++;
 			}
-			if ($flag === true)
-				return $elements[$index - 1];
+			if ($flag===true)
+				return $elements[$index-1];
 		} elseif ($elements instanceof BaseHtml) {
 			if ($callback($elements))
 				return $elements;
@@ -126,12 +126,12 @@ 
 	}
 
 	protected function setWrapBefore($wrapBefore) {
-		$this->_wrapBefore = $wrapBefore;
+		$this->_wrapBefore=$wrapBefore;
 		return $this;
 	}
 
 	protected function setWrapAfter($wrapAfter) {
-		$this->_wrapAfter = $wrapAfter;
+		$this->_wrapAfter=$wrapAfter;
 		return $this;
 	}
 
@@ -140,18 +140,18 @@ 
 	}
 
 	public function setTagName($tagName) {
-		$this->tagName = $tagName;
+		$this->tagName=$tagName;
 		return $this;
 	}
 
 	public function fromArray($array) {
 		foreach ($this as $key => $value) {
-			if (array_key_exists($key, $array) === true)
-				$this->_callSetter("set" . ucfirst($key), $key, $array[$key], $array);
+			if (array_key_exists($key, $array)===true)
+				$this->_callSetter("set".ucfirst($key), $key, $array[$key], $array);
 		}
 		foreach ($array as $key => $value) {
-			if ($this->_callSetter($key, $key, $value, $array) === false) {
-				$this->_callSetter("set" . ucfirst($key), $key, $value, $array);
+			if ($this->_callSetter($key, $key, $value, $array)===false) {
+				$this->_callSetter("set".ucfirst($key), $key, $value, $array);
 			}
 		}
 		return $array;
@@ -168,17 +168,17 @@ 
 
 	public function fromDatabaseObject($object, $function) {}
 
-	public function wrap($before, $after = "") {
+	public function wrap($before, $after="") {
 		if (isset($before)) {
 			array_unshift($this->_wrapBefore, $before);
 		}
-		$this->_wrapAfter[] = $after;
+		$this->_wrapAfter[]=$after;
 		return $this;
 	}
 
 	public function getElementById($identifier, $elements) {
-		return $this->_getElementBy(function (BaseWidget $element) use ($identifier) {
-			return $element->getIdentifier() === $identifier;
+		return $this->_getElementBy(function(BaseWidget $element) use ($identifier) {
+			return $element->getIdentifier()===$identifier;
 		}, $elements);
 	}
 
@@ -187,50 +187,50 @@ 
 	}
 
 	public function setBsComponent($bsComponent) {
-		$this->_bsComponent = $bsComponent;
+		$this->_bsComponent=$bsComponent;
 		return $this;
 	}
 
-	protected function compile_once(JsUtils $js = NULL, &$view = NULL) {
-		if (! $this->_compiled) {
+	protected function compile_once(JsUtils $js=NULL, &$view=NULL) {
+		if (!$this->_compiled) {
 			if (isset($js)) {
-				$beforeCompile = $js->getParam("beforeCompileHtml");
+				$beforeCompile=$js->getParam("beforeCompileHtml");
 				if (\is_callable($beforeCompile)) {
 					$beforeCompile($this, $js, $view);
 				}
 			}
 			$this->callCallback($this->_preCompile);
 			unset($this->properties["jsCallback"]);
-			$this->_compiled = true;
+			$this->_compiled=true;
 		}
 	}
 
-	public function compile(JsUtils $js = NULL, &$view = NULL) {
+	public function compile(JsUtils $js=NULL, &$view=NULL) {
 		$this->compile_once($js, $view);
-		$result = $this->getTemplate($js, $view);
+		$result=$this->getTemplate($js, $view);
 		foreach ($this as $key => $value) {
-			if (\strstr($result, "%{$key}%") !== false) {
+			if (\strstr($result, "%{$key}%")!==false) {
 				if (\is_array($value)) {
-					$v = PropertyWrapper::wrap($value, $js, $view);
+					$v=PropertyWrapper::wrap($value, $js, $view);
 				} elseif ($value instanceof \stdClass) {
-					$v = \print_r($value, true);
+					$v=\print_r($value, true);
 				} elseif ($value instanceof BaseHtml) {
-					$v = $value->compile($js, $view);
+					$v=$value->compile($js, $view);
 				} else {
-					$v = $value;
+					$v=$value;
 				}
-				$result = \str_replace("%{$key}%", $v ?? '', $result);
+				$result=\str_replace("%{$key}%", $v ?? '', $result);
 			}
 		}
-		if (isset($js) === true) {
+		if (isset($js)===true) {
 			$this->run($js);
-			if (isset($view) === true) {
+			if (isset($view)===true) {
 				$js->addViewElement($this->getLibraryId(), $result, $view);
 			}
 		}
 
 		if (\is_callable($this->_postCompile)) {
-			$pc = $this->_postCompile;
+			$pc=$this->_postCompile;
 			$pc($this);
 		}
 		return $result;
@@ -247,12 +247,12 @@ 
 	 *        	default: ["jsCallback"=>"","jqueryDone"=>"append"]
 	 * @return \Ajax\common\html\BaseHtml
 	 */
-	public function setDraggable($attr = "id", $dropZone = null, $parameters = []) {
+	public function setDraggable($attr="id", $dropZone=null, $parameters=[]) {
 		$this->setProperty("draggable", "true");
 		$this->addEvent("dragstart", Javascript::draggable($attr));
 		if (isset($dropZone) && $dropZone instanceof BaseHtml) {
-			$jqueryDone = "append";
-			$jsCallback = "";
+			$jqueryDone="append";
+			$jsCallback="";
 			extract($parameters);
 			$dropZone->asDropZone($jsCallback, $jqueryDone, $parameters);
 		}
@@ -267,8 +267,8 @@ 
 	 * @param array $parameters
 	 * @return \Ajax\common\html\BaseHtml
 	 */
-	public function asDropZone($jsCallback = "", $jqueryDone = "append", $parameters = []) {
-		$stopPropagation = false;
+	public function asDropZone($jsCallback="", $jqueryDone="append", $parameters=[]) {
+		$stopPropagation=false;
 		$this->addEvent("dragover", '', $stopPropagation, true);
 		extract($parameters);
 		$this->addEvent("drop", Javascript::dropZone($jqueryDone, $jsCallback), $stopPropagation, true);
@@ -285,9 +285,9 @@ 
 	 * @param array $parameters
 	 * @return \Ajax\common\html\BaseHtml
 	 */
-	public function asFileDropZone($responseElement = null, $url = null, $progress = null, $jsCallback = "", $parameters = []) {
-		$stopPropagation = false;
-		$defaultAjaxAttributes = [
+	public function asFileDropZone($responseElement=null, $url=null, $progress=null, $jsCallback="", $parameters=[]) {
+		$stopPropagation=false;
+		$defaultAjaxAttributes=[
 			'contentType' => 'false',
 			'processData' => 'false'
 		];
@@ -295,15 +295,15 @@ 
 		extract($parameters);
 		$this->addEvent("drop", Javascript::fileDropZone($jsCallback), $stopPropagation, true);
 		if (isset($ajaxAttributes)) {
-			$ajaxAttributes += $defaultAjaxAttributes;
+			$ajaxAttributes+=$defaultAjaxAttributes;
 		} else {
-			$ajaxAttributes = $defaultAjaxAttributes;
+			$ajaxAttributes=$defaultAjaxAttributes;
 		}
 		if (isset($progress)) {
-			$progress = new HtmlProgress($this->_identifier . '-pg', 0, $progress);
+			$progress=new HtmlProgress($this->_identifier.'-pg', 0, $progress);
 			$progress->setTotal(100);
 			$this->wrap('', $progress);
-			$ajaxAttributes['upload'] = "$('#" . $this->_identifier . "-pg').progress('set percent', Math.ceil(event.loaded/event.total)*100);";
+			$ajaxAttributes['upload']="$('#".$this->_identifier."-pg').progress('set percent', Math.ceil(event.loaded/event.total)*100);";
 		}
 		if (isset($url)) {
 			$this->postOn('upload', $url, 'event.target.upload', $responseElement, $ajaxAttributes);
@@ -316,21 +316,21 @@ 
 	}
 
 	public function onPostCompile($callback) {
-		$this->_postCompile = $callback;
+		$this->_postCompile=$callback;
 	}
 
 	public function onPreCompile($callback) {
-		$this->_preCompile = $this->addCallback($this->_preCompile, $callback);
+		$this->_preCompile=$this->addCallback($this->_preCompile, $callback);
 	}
 
 	private function addCallback($originalValue, $callback) {
 		if (isset($originalValue)) {
-			if (! is_array($originalValue)) {
-				$result = [
+			if (!is_array($originalValue)) {
+				$result=[
 					$originalValue
 				];
 			}
-			$result[] = $callback;
+			$result[]=$callback;
 			return $result;
 		}
 		return $callback;

Ajax/common/traits/JsUtilsInternalTrait.php

Braces +6 added lines, -4 removed lines

@@ -19,8 +19,9 @@ 
 	 * @param mixed $view
 	 */
 	protected function _compileLibrary(BaseGui $library, &$view = NULL) {
-		if (isset($view))
-			$library->compileHtml($this, $view);
+		if (isset($view)) {
+					$library->compileHtml($this, $view);
+		}
 		if ($library->isAutoCompile()) {
 			$library->compile(true);
 		}
@@ -39,8 +40,9 @@ 
 	}
 
 	protected function minify($input) {
-		if (trim($input) === "")
-			return $input;
+		if (trim($input) === "") {
+					return $input;
+		}
 		$input = preg_replace(array(
 			// Remove comment(s)
 			'#\s*("(?:[^"\\\]++|\\\.)*+"|\'(?:[^\'\\\\]++|\\\.)*+\')\s*|\s*\/\*(?!\!|@cc_on)(?>[\s\S]*?\*\/)\s*|\s*(?<![\:\=])\/\/.*(?=[\n\r]|$)|^\s*|\s*$#',

Spacing +15 added lines, -15 removed lines

@@ -5,12 +5,12 @@ 
 
 trait JsUtilsInternalTrait {
 
-	protected $jquery_code_for_compile = array();
+	protected $jquery_code_for_compile=array();
 
-	protected $jquery_code_for_compile_at_last = array();
+	protected $jquery_code_for_compile_at_last=array();
 
 	protected function _addToCompile($jsScript) {
-		$this->jquery_code_for_compile[] = $jsScript;
+		$this->jquery_code_for_compile[]=$jsScript;
 	}
 
 	/**
@@ -18,7 +18,7 @@ 
 	 * @param BaseGui $library
 	 * @param mixed $view
 	 */
-	protected function _compileLibrary(BaseGui $library, &$view = NULL) {
+	protected function _compileLibrary(BaseGui $library, &$view=NULL) {
 		if (isset($view))
 			$library->compileHtml($this, $view);
 		if ($library->isAutoCompile()) {
@@ -27,21 +27,21 @@ 
 	}
 
 	protected function defer($script) {
-		$result = "(function(){window.defer=function (method) {if (window.jQuery) method(); else setTimeout(function() { window.defer(method); }, 50);};";
-		$result .= "window.defer(function(){" . $script . "})})()";
+		$result="(function(){window.defer=function (method) {if (window.jQuery) method(); else setTimeout(function() { window.defer(method); }, 50);};";
+		$result.="window.defer(function(){".$script."})})()";
 		return $result;
 	}
 
 	protected function ready($script) {
-		$result = '$(function() {' . "\n";
-		$result .= $script . '});';
+		$result='$(function() {'."\n";
+		$result.=$script.'});';
 		return $result;
 	}
 
 	protected function minify($input) {
-		if (trim($input) === "")
+		if (trim($input)==="")
 			return $input;
-		$input = preg_replace(array(
+		$input=preg_replace(array(
 			// Remove comment(s)
 			'#\s*("(?:[^"\\\]++|\\\.)*+"|\'(?:[^\'\\\\]++|\\\.)*+\')\s*|\s*\/\*(?!\!|@cc_on)(?>[\s\S]*?\*\/)\s*|\s*(?<![\:\=])\/\/.*(?=[\n\r]|$)|^\s*|\s*$#',
 			// Remove white-space(s) outside the string and regex
@@ -59,7 +59,7 @@ 
 			'$1$3',
 			'$1.$3'
 		), $input);
-		$input = str_replace("}$", "};$", $input);
+		$input=str_replace("}$", "};$", $input);
 		return $input;
 	}
 
@@ -69,9 +69,9 @@ 
 	 * @param string $src
 	 * @return string
 	 */
-	protected function _open_script($src = '') {
-		$str = '<script ';
-		$str .= ($src == '') ? '>' : ' src="' . $src . '">';
+	protected function _open_script($src='') {
+		$str='<script ';
+		$str.=($src=='') ? '>' : ' src="'.$src.'">';
 		return $str;
 	}
 
@@ -81,7 +81,7 @@ 
 	 * @param string $extra
 	 * @return string
 	 */
-	protected function _close_script($extra = "\n") {
+	protected function _close_script($extra="\n") {
 		return "</script>$extra";
 	}
 

Ajax/semantic/components/validation/FieldValidation.php

Spacing +19 added lines, -19 removed lines

@@ -30,7 +30,7 @@ 
 	 */
 	protected $customRules;
 
-	protected $hasCustomRules = false;
+	protected $hasCustomRules=false;
 
 	/**
 	 *
@@ -41,8 +41,8 @@ 
 	protected $optional;
 
 	public function __construct($identifier) {
-		$this->identifier = $identifier;
-		$this->rules = [];
+		$this->identifier=$identifier;
+		$this->rules=[];
 	}
 
 	public function getIdentifier() {
@@ -50,7 +50,7 @@ 
 	}
 
 	public function setIdentifier($identifier) {
-		$this->identifier = $identifier;
+		$this->identifier=$identifier;
 		return $this;
 	}
 
@@ -65,47 +65,47 @@ 
 	 * @param string $value
 	 * @return Rule
 	 */
-	public function addRule($type, $prompt = NULL, $value = NULL) {
+	public function addRule($type, $prompt=NULL, $value=NULL) {
 		if ($type instanceof Rule) {
-			$rule = $type;
+			$rule=$type;
 			if ($type instanceof CustomRule) {
-				$this->customRules[] = $type;
-				$this->hasCustomRules = true;
+				$this->customRules[]=$type;
+				$this->hasCustomRules=true;
 			}
 		} elseif (\is_array($type)) {
-			$value = JArray::getValue($type, "value", 2);
-			$prompt = JArray::getValue($type, "prompt", 1);
-			$type = JArray::getValue($type, "type", 0);
-			$rule = new Rule($type, $prompt, $value);
+			$value=JArray::getValue($type, "value", 2);
+			$prompt=JArray::getValue($type, "prompt", 1);
+			$type=JArray::getValue($type, "type", 0);
+			$rule=new Rule($type, $prompt, $value);
 		} else {
-			$rule = new Rule($type, $prompt, $value);
+			$rule=new Rule($type, $prompt, $value);
 		}
-		$this->rules[] = $rule;
+		$this->rules[]=$rule;
 		return $rule;
 	}
 
 	#[\ReturnTypeWillChange]
 	public function jsonSerialize() {
-		$result = [
+		$result=[
 			"identifier" => $this->identifier,
 			"rules" => $this->rules
 		];
 		if ($this->optional) {
-			$result["optional"] = true;
+			$result["optional"]=true;
 		}
 		if (isset($this->depends)) {
-			$result["depends"] = $this->depends;
+			$result["depends"]=$this->depends;
 		}
 		return $result;
 	}
 
 	public function setDepends($depends) {
-		$this->depends = $depends;
+		$this->depends=$depends;
 		return $this;
 	}
 
 	public function setOptional($optional) {
-		$this->optional = $optional;
+		$this->optional=$optional;
 		return $this;
 	}
 

Ajax/semantic/components/validation/Rule.php

Braces +9 added lines, -6 removed lines

@@ -59,10 +59,12 @@ 
 	#[\ReturnTypeWillChange]
 	public function jsonSerialize() {
 		$result= ["type"=>$this->type];
-		if(isset($this->prompt))
-			$result["prompt"]=$this->prompt;
-		if(isset($this->value))
-			$result["value"]=$this->value;
+		if(isset($this->prompt)) {
+					$result["prompt"]=$this->prompt;
+		}
+		if(isset($this->value)) {
+					$result["value"]=$this->value;
+		}
 		return $result;
 	}
 
@@ -94,8 +96,9 @@ 
 	 * @return \Ajax\semantic\components\validation\Rule
 	 */
 	public static function integer($min=NULL,$max=NULL,$prompt=NULL){
-		if(\is_int($min) && \is_int($max))
-			return new Rule("integer[{$min}..{$max}]",$prompt);
+		if(\is_int($min) && \is_int($max)) {
+					return new Rule("integer[{$min}..{$max}]",$prompt);
+		}
 		return new Rule("integer",$prompt);
 	}
 

Spacing +49 added lines, -49 removed lines

@@ -8,7 +8,7 @@ 
  * @version 1.001
  * Generates a JSON Rule for the validation of a field
  */
-class Rule implements \JsonSerializable{
+class Rule implements \JsonSerializable {
 	/**
 	 * @var string
 	 */
@@ -23,7 +23,7 @@ 
 	 */
 	private $value;
 
-	public function __construct($type,$prompt=NULL,$value=NULL){
+	public function __construct($type, $prompt=NULL, $value=NULL) {
 		$this->type=$type;
 		$this->prompt=$prompt;
 		$this->value=$value;
@@ -58,10 +58,10 @@ 
 
 	#[\ReturnTypeWillChange]
 	public function jsonSerialize() {
-		$result= ["type"=>$this->type];
-		if(isset($this->prompt))
+		$result=["type"=>$this->type];
+		if (isset($this->prompt))
 			$result["prompt"]=$this->prompt;
-		if(isset($this->value))
+		if (isset($this->value))
 			$result["value"]=$this->value;
 		return $result;
 	}
@@ -72,8 +72,8 @@ 
 	 * @param string $prompt
 	 * @return \Ajax\semantic\components\validation\Rule
 	 */
-	public static function match($name,$prompt=NULL){
-		return new Rule("match[".$name."]",$prompt);
+	public static function match($name, $prompt=NULL){
+		return new Rule("match[".$name."]", $prompt);
 	}
 
 	/**
@@ -82,8 +82,8 @@ 
 	 * @param string $prompt
 	 * @return \Ajax\semantic\components\validation\Rule
 	 */
-	public static function different($name,$prompt=NULL){
-		return new Rule("different[".$name."]",$prompt);
+	public static function different($name, $prompt=NULL) {
+		return new Rule("different[".$name."]", $prompt);
 	}
 
 	/**
@@ -93,82 +93,82 @@ 
 	 * @param string $prompt
 	 * @return \Ajax\semantic\components\validation\Rule
 	 */
-	public static function integer($min=NULL,$max=NULL,$prompt=NULL){
-		if(\is_int($min) && \is_int($max))
-			return new Rule("integer[{$min}..{$max}]",$prompt);
-		return new Rule("integer",$prompt);
+	public static function integer($min=NULL, $max=NULL, $prompt=NULL) {
+		if (\is_int($min) && \is_int($max))
+			return new Rule("integer[{$min}..{$max}]", $prompt);
+		return new Rule("integer", $prompt);
 	}
 
-	public static function decimal($prompt=NULL){
-		return new Rule("decimal",$prompt);
+	public static function decimal($prompt=NULL) {
+		return new Rule("decimal", $prompt);
 	}
 
-	public static function number($prompt=NULL){
-		return new Rule("number",$prompt);
+	public static function number($prompt=NULL) {
+		return new Rule("number", $prompt);
 	}
 
-	public static function is($value,$prompt=NULL){
-		return new Rule("is[".$value."]",$prompt);
+	public static function is($value, $prompt=NULL) {
+		return new Rule("is[".$value."]", $prompt);
 	}
 
-	public static function isExactly($value,$prompt=NULL){
-		return new Rule("isExactly[".$value."]",$prompt);
+	public static function isExactly($value, $prompt=NULL) {
+		return new Rule("isExactly[".$value."]", $prompt);
 	}
 
-	public static function not($value,$prompt=NULL){
-		return new Rule("not[".$value."]",$prompt);
+	public static function not($value, $prompt=NULL) {
+		return new Rule("not[".$value."]", $prompt);
 	}
 
-	public static function notExactly($value,$prompt=NULL){
-		return new Rule("notExactly[".$value."]",$prompt);
+	public static function notExactly($value, $prompt=NULL) {
+		return new Rule("notExactly[".$value."]", $prompt);
 	}
 
-	public static function contains($value,$prompt=NULL){
-		return new Rule("contains[".$value."]",$prompt);
+	public static function contains($value, $prompt=NULL) {
+		return new Rule("contains[".$value."]", $prompt);
 	}
 
-	public static function containsExactly($value,$prompt=NULL){
-		return new Rule("containsExactly[".$value."]",$prompt);
+	public static function containsExactly($value, $prompt=NULL) {
+		return new Rule("containsExactly[".$value."]", $prompt);
 	}
 
-	public static function doesntContain($value,$prompt=NULL){
-		return new Rule("doesntContain[".$value."]",$prompt);
+	public static function doesntContain($value, $prompt=NULL) {
+		return new Rule("doesntContain[".$value."]", $prompt);
 	}
 
-	public static function doesntContainExactly($value,$prompt=NULL){
-		return new Rule("doesntContainExactly[".$value."]",$prompt);
+	public static function doesntContainExactly($value, $prompt=NULL) {
+		return new Rule("doesntContainExactly[".$value."]", $prompt);
 	}
 
-	public static function minCount($value,$prompt=NULL){
-		return new Rule("minCount[".$value."]",$prompt);
+	public static function minCount($value, $prompt=NULL) {
+		return new Rule("minCount[".$value."]", $prompt);
 	}
 
-	public static function maxCount($value,$prompt=NULL){
-		return new Rule("maxCount[".$value."]",$prompt);
+	public static function maxCount($value, $prompt=NULL) {
+		return new Rule("maxCount[".$value."]", $prompt);
 	}
 
-	public static function exactCount($value,$prompt=NULL){
-		return new Rule("exactCount[".$value."]",$prompt);
+	public static function exactCount($value, $prompt=NULL) {
+		return new Rule("exactCount[".$value."]", $prompt);
 	}
 
-	public static function email($prompt=NULL){
-		return new Rule("email",$prompt);
+	public static function email($prompt=NULL) {
+		return new Rule("email", $prompt);
 	}
 
-	public static function url($prompt=NULL){
-		return new Rule("url",$prompt);
+	public static function url($prompt=NULL) {
+		return new Rule("url", $prompt);
 	}
 
-	public static function regExp($value,$prompt=NULL){
-		return new Rule("regExp",$prompt,$value);
+	public static function regExp($value, $prompt=NULL) {
+		return new Rule("regExp", $prompt, $value);
 	}
 
-	public static function custom($name,$jsFunction){
-		return "$.fn.form.settings.rules.".$name." =".$jsFunction ;
+	public static function custom($name, $jsFunction) {
+		return "$.fn.form.settings.rules.".$name." =".$jsFunction;
 	}
 
-	public static function ajax(JsUtils $js,$name,$url,$params,$jsCallback,$method="post",$parameters=[]){
-		$parameters=\array_merge(["async"=>false,"url"=>$url,"params"=>$params,"hasLoader"=>false,"jsCallback"=>$jsCallback,"dataType"=>"json","stopPropagation"=>false,"preventDefault"=>false,"responseElement"=>null],$parameters);
+	public static function ajax(JsUtils $js, $name, $url, $params, $jsCallback, $method="post", $parameters=[]) {
+		$parameters=\array_merge(["async"=>false, "url"=>$url, "params"=>$params, "hasLoader"=>false, "jsCallback"=>$jsCallback, "dataType"=>"json", "stopPropagation"=>false, "preventDefault"=>false, "responseElement"=>null], $parameters);
 		$ajax=new AjaxCall($method, $parameters);
 		return self::custom($name, "function(value,ruleValue){var result=true;".$ajax->compile($js)."return result;}");
 	}

Ajax/service/Javascript.php

Spacing +21 added lines, -21 removed lines

@@ -3,36 +3,36 @@ 
 
 class Javascript {
 
-	public static $preventDefault = "\nif(event && event.preventDefault) event.preventDefault();\n";
+	public static $preventDefault="\nif(event && event.preventDefault) event.preventDefault();\n";
 
-	public static $stopPropagation = "\nif(event && event.stopPropagation) event.stopPropagation();\n";
+	public static $stopPropagation="\nif(event && event.stopPropagation) event.stopPropagation();\n";
 
-	public static function draggable($attr = "id") {
-		return 'var dt=event.dataTransfer || event.originalEvent.dataTransfer;dt.setData("text/plain",JSON.stringify({id:$(event.target).attr("id"),data:$(event.target).attr("' . $attr . '")}));';
+	public static function draggable($attr="id") {
+		return 'var dt=event.dataTransfer || event.originalEvent.dataTransfer;dt.setData("text/plain",JSON.stringify({id:$(event.target).attr("id"),data:$(event.target).attr("'.$attr.'")}));';
 	}
 
-	public static function dropZone($jqueryDone, $jsCallback = "") {
-		$done = ($jqueryDone != null) ? '$(event.target).' . $jqueryDone . '($("#"+_data.id));' : '';
-		return 'var dt=event.dataTransfer || event.originalEvent.dataTransfer;var _data=JSON.parse(dt.getData("text/plain"));' . $done . 'var data=_data.data;' . $jsCallback;
+	public static function dropZone($jqueryDone, $jsCallback="") {
+		$done=($jqueryDone!=null) ? '$(event.target).'.$jqueryDone.'($("#"+_data.id));' : '';
+		return 'var dt=event.dataTransfer || event.originalEvent.dataTransfer;var _data=JSON.parse(dt.getData("text/plain"));'.$done.'var data=_data.data;'.$jsCallback;
 	}
 
-	public static function fileDropZone($jsCallback = "") {
-		$done = 'event.target.upload=formData;$(event.target).trigger("upload");';
-		return 'var dt=event.dataTransfer || event.originalEvent.dataTransfer;var files=dt.files;var formData = new FormData();for (var i = 0; i < files.length; i++) {formData.append("file-"+i,files[i]);}' . $done . $jsCallback;
+	public static function fileDropZone($jsCallback="") {
+		$done='event.target.upload=formData;$(event.target).trigger("upload");';
+		return 'var dt=event.dataTransfer || event.originalEvent.dataTransfer;var files=dt.files;var formData = new FormData();for (var i = 0; i < files.length; i++) {formData.append("file-"+i,files[i]);}'.$done.$jsCallback;
 	}
 
 	public static function containsCode($expression) {
-		if ($expression == null) {
+		if ($expression==null) {
 			return false;
 		}
-		return \strrpos($expression, 'this') !== false || \strrpos($expression, 'event') !== false || \strrpos($expression, 'self') !== false;
+		return \strrpos($expression, 'this')!==false || \strrpos($expression, 'event')!==false || \strrpos($expression, 'self')!==false;
 	}
 
 	public static function isFunction($jsCode) {
 		return JString::startswith($jsCode, "function");
 	}
 
-	public static function fileUploadBehavior($id = '') {
+	public static function fileUploadBehavior($id='') {
 		return "$('input:text, .ui.button', '#{$id}').on('click', function (e) {e.preventDefault();\$('input:file', '#{$id}').click();});
 				$('input:file', '#{$id}').on('change', function (e) {if(e.target.files.length){var name = e.target.files[0].name;$('input:text', $(e.target).parent()).val(name);}});";
 	}
@@ -46,8 +46,8 @@ 
 	 * @return string
 	 */
 	public static function prep_element($element) {
-		if (self::containsCode($element) === false) {
-			$element = '"' . addslashes($element ?? '') . '"';
+		if (self::containsCode($element)===false) {
+			$element='"'.addslashes($element ?? '').'"';
 		}
 		return $element;
 	}
@@ -62,24 +62,24 @@ 
 	 */
 	public static function prep_value($value) {
 		if (\is_array($value)) {
-			$value = implode(",", $value);
+			$value=implode(",", $value);
 		}
-		if (self::containsCode($value) === false) {
-			$value = \str_replace([
+		if (self::containsCode($value)===false) {
+			$value=\str_replace([
 				"\\",
 				"\""
 			], [
 				"\\\\",
 				"\\\""
 			], $value);
-			$value = '"' . $value . '"';
+			$value='"'.$value.'"';
 		}
 		return trim($value, "%");
 	}
 
 	public static function prep_jquery_selector($value) {
-		if (JString::startswith($value, '$(') === false) {
-			return '$(' . self::prep_value($value) . ')';
+		if (JString::startswith($value, '$(')===false) {
+			return '$('.self::prep_value($value).')';
 		}
 		return $value;
 	}

Ajax/common/Widget.php

Spacing +76 added lines, -76 removed lines

@@ -20,7 +20,7 @@ 
 use Ajax\common\html\traits\BaseHooksTrait;
 
 abstract class Widget extends HtmlDoubleElement {
-	use FieldAsTrait,FormTrait,BaseHooksTrait;
+	use FieldAsTrait, FormTrait, BaseHooksTrait;
 
 	/**
 	 *
@@ -66,27 +66,27 @@ 
 
 	protected $_hasRules;
 
-	public function __construct($identifier, $model, $modelInstance = NULL) {
+	public function __construct($identifier, $model, $modelInstance=NULL) {
 		parent::__construct($identifier);
-		$this->_template = "%wrapContentBefore%%content%%wrapContentAfter%";
+		$this->_template="%wrapContentBefore%%content%%wrapContentAfter%";
 		$this->setModel($model);
 		if (isset($modelInstance)) {
 			if (\is_object($modelInstance)) {
-				$this->_model = \get_class($modelInstance);
+				$this->_model=\get_class($modelInstance);
 			}
 			$this->show($modelInstance);
 		}
-		$this->_generated = false;
+		$this->_generated=false;
 	}
 
 	protected function _init($instanceViewer, $contentKey, $content, $edition) {
-		$this->_instanceViewer = $instanceViewer;
-		$this->content = [
+		$this->_instanceViewer=$instanceViewer;
+		$this->content=[
 			$contentKey => $content
 		];
-		$this->_self = $content;
-		$this->_toolbarPosition = PositionInTable::BEFORETABLE;
-		$this->_edition = $edition;
+		$this->_self=$content;
+		$this->_toolbarPosition=PositionInTable::BEFORETABLE;
+		$this->_edition=$edition;
 	}
 
 	/**
@@ -95,16 +95,16 @@ 
 	 * @return int|string|boolean
 	 */
 	protected function _getIndex($fieldName) {
-		$index = $fieldName;
+		$index=$fieldName;
 		if (\is_string($fieldName)) {
-			$fields = $this->_instanceViewer->getVisibleProperties();
-			$index = \array_search($fieldName, $fields);
+			$fields=$this->_instanceViewer->getVisibleProperties();
+			$index=\array_search($fieldName, $fields);
 		}
 		return $index;
 	}
 
-	protected function _getFieldIdentifier($prefix, $name = "") {
-		return $this->identifier . "-{$prefix}-" . $this->_instanceViewer->getIdentifier();
+	protected function _getFieldIdentifier($prefix, $name="") {
+		return $this->identifier."-{$prefix}-".$this->_instanceViewer->getIdentifier();
 	}
 
 	protected function _getFieldName($index) {
@@ -115,13 +115,13 @@ 
 		return $this->_instanceViewer->getCaption($index);
 	}
 
-	abstract protected function _setToolbarPosition($table, $captions = NULL);
+	abstract protected function _setToolbarPosition($table, $captions=NULL);
 
 	public function show($modelInstance) {
 		if (\is_array($modelInstance)) {
-			$modelInstance = \json_decode(\json_encode($modelInstance), FALSE);
+			$modelInstance=\json_decode(\json_encode($modelInstance), FALSE);
 		}
-		$this->_modelInstance = $modelInstance;
+		$this->_modelInstance=$modelInstance;
 	}
 
 	public function getModel() {
@@ -129,7 +129,7 @@ 
 	}
 
 	public function setModel($_model) {
-		$this->_model = $_model;
+		$this->_model=$_model;
 		return $this;
 	}
 
@@ -138,13 +138,13 @@ 
 	}
 
 	public function setInstanceViewer($_instanceViewer) {
-		$this->_instanceViewer = $_instanceViewer;
+		$this->_instanceViewer=$_instanceViewer;
 		return $this;
 	}
 
 	abstract public function getHtmlComponent();
 
-	public function setAttached($value = true) {
+	public function setAttached($value=true) {
 		return $this->getHtmlComponent()->setAttached($value);
 	}
 
@@ -159,8 +159,8 @@ 
 	 * @return Widget
 	 */
 	public function afterCompile($index, $callback) {
-		$index = $this->_getIndex($index);
-		if ($index !== false) {
+		$index=$this->_getIndex($index);
+		if ($index!==false) {
 			$this->_instanceViewer->afterCompile($index, $callback);
 		}
 		return $this;
@@ -185,7 +185,7 @@ 
 		return $this;
 	}
 
-	public function addField($field, $key = null) {
+	public function addField($field, $key=null) {
 		$this->_instanceViewer->addField($field, $key);
 		return $this;
 	}
@@ -199,10 +199,10 @@ 
 		return $this->_instanceViewer->visiblePropertiesCount();
 	}
 
-	public function addMessage($attributes = NULL, $fieldName = "message") {
+	public function addMessage($attributes=NULL, $fieldName="message") {
 		$this->_instanceViewer->addField($fieldName);
-		$count = $this->_instanceViewer->visiblePropertiesCount();
-		return $this->fieldAsMessage($count - 1, $attributes);
+		$count=$this->_instanceViewer->visiblePropertiesCount();
+		return $this->fieldAsMessage($count-1, $attributes);
 	}
 
 	public function addErrorMessage() {
@@ -211,15 +211,15 @@ 
 		], "message");
 	}
 
-	public function insertField($index, $field, $key = null) {
-		$index = $this->_getIndex($index);
+	public function insertField($index, $field, $key=null) {
+		$index=$this->_getIndex($index);
 		$this->_instanceViewer->insertField($index, $field, $key);
 		return $this;
 	}
 
-	public function insertInField($index, $field, $key = null) {
-		$index = $this->_getIndex($index);
-		if ($index !== false) {
+	public function insertInField($index, $field, $key=null) {
+		$index=$this->_getIndex($index);
+		if ($index!==false) {
 			$this->_instanceViewer->insertInField($index, $field, $key);
 		}
 		return $this;
@@ -235,8 +235,8 @@ 
 	 * @return Widget
 	 */
 	public function setValueFunction($index, $callback) {
-		$index = $this->_getIndex($index);
-		if ($index !== false) {
+		$index=$this->_getIndex($index);
+		if ($index!==false) {
 			$this->_instanceViewer->setValueFunction($index, $callback);
 		}
 		return $this;
@@ -252,8 +252,8 @@ 
 	 * @return \Ajax\semantic\html\collections\menus\HtmlMenu
 	 */
 	public function getToolbar() {
-		if (isset($this->_toolbar) === false) {
-			$this->_toolbar = new HtmlMenu("toolbar-" . $this->identifier);
+		if (isset($this->_toolbar)===false) {
+			$this->_toolbar=new HtmlMenu("toolbar-".$this->identifier);
 		}
 		return $this->_toolbar;
 	}
@@ -266,11 +266,11 @@ 
 	 *        	function to call on $element
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
-	public function addInToolbar($element, $callback = NULL) {
-		$tb = $this->getToolbar();
+	public function addInToolbar($element, $callback=NULL) {
+		$tb=$this->getToolbar();
 		if ($element instanceof BaseWidget) {
-			if ($element->getIdentifier() === "") {
-				$element->setIdentifier("tb-item-" . $this->identifier . "-" . $tb->count());
+			if ($element->getIdentifier()==="") {
+				$element->setIdentifier("tb-item-".$this->identifier."-".$tb->count());
 			}
 		}
 		if (isset($callback)) {
@@ -289,8 +289,8 @@ 
 	 *        	function($element)
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
-	public function addItemInToolbar($caption, $icon = NULL, $callback = NULL) {
-		$result = $this->addInToolbar($caption, $callback);
+	public function addItemInToolbar($caption, $icon=NULL, $callback=NULL) {
+		$result=$this->addInToolbar($caption, $callback);
 		if (isset($icon) && method_exists($result, "addIcon"))
 			$result->addIcon($icon);
 		return $result;
@@ -303,7 +303,7 @@ 
 	 *        	function($element)
 	 * @return \Ajax\common\Widget
 	 */
-	public function addItemsInToolbar(array $items, $callback = NULL) {
+	public function addItemsInToolbar(array $items, $callback=NULL) {
 		if (JArray::isAssociative($items)) {
 			foreach ($items as $icon => $item) {
 				$this->addItemInToolbar($item, $icon, $callback);
@@ -324,10 +324,10 @@ 
 	 *        	function($element)
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
-	public function addDropdownInToolbar($value, $items, $callback = NULL) {
-		$dd = $value;
+	public function addDropdownInToolbar($value, $items, $callback=NULL) {
+		$dd=$value;
 		if (\is_string($value)) {
-			$dd = new HtmlDropdown("dropdown-" . $this->identifier . "-" . $value, $value, $items);
+			$dd=new HtmlDropdown("dropdown-".$this->identifier."-".$value, $value, $items);
 		}
 		return $this->addInToolbar($dd, $callback);
 	}
@@ -340,8 +340,8 @@ 
 	 *        	function($element)
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
-	public function addButtonInToolbar($caption, $cssStyle = null, $callback = NULL) {
-		$bt = new HtmlButton("bt-" . $caption, $caption, $cssStyle);
+	public function addButtonInToolbar($caption, $cssStyle=null, $callback=NULL) {
+		$bt=new HtmlButton("bt-".$caption, $caption, $cssStyle);
 		return $this->addInToolbar($bt, $callback);
 	}
 
@@ -353,8 +353,8 @@ 
 	 *        	function($element)
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
-	public function addButtonsInToolbar(array $captions, $asIcon = false, $callback = NULL) {
-		$bts = new HtmlButtonGroups("", $captions, $asIcon);
+	public function addButtonsInToolbar(array $captions, $asIcon=false, $callback=NULL) {
+		$bts=new HtmlButtonGroups("", $captions, $asIcon);
 		return $this->addInToolbar($bts, $callback);
 	}
 
@@ -366,14 +366,14 @@ 
 	 * @param boolean $labeled
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
-	public function addLabelledIconButtonInToolbar($caption, $icon, $before = true, $labeled = false) {
-		$bt = new HtmlButton("", $caption);
+	public function addLabelledIconButtonInToolbar($caption, $icon, $before=true, $labeled=false) {
+		$bt=new HtmlButton("", $caption);
 		$bt->addIcon($icon, $before, $labeled);
 		return $this->addInToolbar($bt);
 	}
 
-	public function addSubmitInToolbar($identifier, $value, $cssStyle = NULL, $url = NULL, $responseElement = NULL, $parameters = NULL) {
-		$button = new HtmlButton($identifier, $value, $cssStyle);
+	public function addSubmitInToolbar($identifier, $value, $cssStyle=NULL, $url=NULL, $responseElement=NULL, $parameters=NULL) {
+		$button=new HtmlButton($identifier, $value, $cssStyle);
 		$this->_buttonAsSubmit($button, "click", $url, $responseElement, $parameters);
 		return $this->addInToolbar($button);
 	}
@@ -396,8 +396,8 @@ 
 	 * @param boolean $_edition
 	 * @return \Ajax\common\Widget
 	 */
-	public function setEdition($_edition = true) {
-		$this->_edition = $_edition;
+	public function setEdition($_edition=true) {
+		$this->_edition=$_edition;
 		return $this;
 	}
 
@@ -426,8 +426,8 @@ 
 	 * @param string|boolean $disable
 	 * @return string
 	 */
-	public function jsDisabled($disable = true) {
-		return "$('#" . $this->identifier . " .ui.input,#" . $this->identifier . " .ui.dropdown,#" . $this->identifier . " .ui.checkbox').toggleClass('disabled'," . $disable . ");";
+	public function jsDisabled($disable=true) {
+		return "$('#".$this->identifier." .ui.input,#".$this->identifier." .ui.dropdown,#".$this->identifier." .ui.checkbox').toggleClass('disabled',".$disable.");";
 	}
 
 	/**
@@ -437,8 +437,8 @@ 
 	 *        	function($element)
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
-	public function addEditButtonInToolbar($caption, $callback = NULL) {
-		$bt = new HtmlButton($this->identifier . "-editBtn", $caption);
+	public function addEditButtonInToolbar($caption, $callback=NULL) {
+		$bt=new HtmlButton($this->identifier."-editBtn", $caption);
 		$bt->setToggle();
 		$bt->setActive($this->_edition);
 		$bt->onClick($this->jsDisabled(Javascript::prep_value("!$(event.target).hasClass('active')")));
@@ -446,18 +446,18 @@ 
 	}
 
 	public function setToolbar(HtmlMenu $_toolbar) {
-		$this->_toolbar = $_toolbar;
+		$this->_toolbar=$_toolbar;
 		return $this;
 	}
 
 	public function setToolbarPosition($_toolbarPosition) {
-		$this->_toolbarPosition = $_toolbarPosition;
+		$this->_toolbarPosition=$_toolbarPosition;
 		return $this;
 	}
 
 	public function getForm() {
-		if (! isset($this->_form)) {
-			$this->_form = new HtmlForm("frm-" . $this->identifier);
+		if (!isset($this->_form)) {
+			$this->_form=new HtmlForm("frm-".$this->identifier);
 			$this->setEdition(true);
 		}
 		return $this->_form;
@@ -471,7 +471,7 @@ 
 	}
 
 	protected function runForm(JsUtils $js) {
-		$fields = $this->getContentInstances(HtmlFormField::class);
+		$fields=$this->getContentInstances(HtmlFormField::class);
 		foreach ($fields as $field) {
 			$this->_form->addField($field);
 		}
@@ -480,10 +480,10 @@ 
 
 	protected function _compileForm() {
 		if (isset($this->_form)) {
-			$noValidate = "";
-			if (\sizeof($this->_form->getValidationParams()) > 0)
-				$noValidate = "novalidate";
-			$this->wrapContent("<form class='" . $this->_form->getProperty('class') . "' id='frm-" . $this->identifier . "' name='frm-" . $this->identifier . "' " . $noValidate . ">", "</form>");
+			$noValidate="";
+			if (\sizeof($this->_form->getValidationParams())>0)
+				$noValidate="novalidate";
+			$this->wrapContent("<form class='".$this->_form->getProperty('class')."' id='frm-".$this->identifier."' name='frm-".$this->identifier."' ".$noValidate.">", "</form>");
 		}
 	}
 
@@ -505,21 +505,21 @@ 
 	}
 
 	public function swapFields($index1, $index2) {
-		$index1 = $this->_getIndex($index1);
-		$index2 = $this->_getIndex($index2);
+		$index1=$this->_getIndex($index1);
+		$index2=$this->_getIndex($index2);
 		return $this->_instanceViewer->swapFields($index1, $index2);
 	}
 
 	public function removeField($index) {
-		$index = $this->_getIndex($index);
-		if ($index !== false) {
+		$index=$this->_getIndex($index);
+		if ($index!==false) {
 			$this->_instanceViewer->removeField($index);
 		}
 		return $this;
 	}
 
-	public function asModal($header = null) {
-		$modal = new HtmlModal("modal-" . $this->identifier, $header);
+	public function asModal($header=null) {
+		$modal=new HtmlModal("modal-".$this->identifier, $header);
 		$modal->setContent($this);
 		if (isset($this->_form)) {
 			$this->_form->onSuccess($modal->jsHide());
@@ -527,7 +527,7 @@ 
 		return $modal;
 	}
 
-	public function addToProperty($name, $value, $separator = " ") {
+	public function addToProperty($name, $value, $separator=" ") {
 		return $this->getHtmlComponent()->addToProperty($name, $value, $separator);
 	}
 

Braces +6 added lines, -4 removed lines

@@ -291,8 +291,9 @@ 
 	 */
 	public function addItemInToolbar($caption, $icon = NULL, $callback = NULL) {
 		$result = $this->addInToolbar($caption, $callback);
-		if (isset($icon) && method_exists($result, "addIcon"))
-			$result->addIcon($icon);
+		if (isset($icon) && method_exists($result, "addIcon")) {
+					$result->addIcon($icon);
+		}
 		return $result;
 	}
 
@@ -481,8 +482,9 @@ 
 	protected function _compileForm() {
 		if (isset($this->_form)) {
 			$noValidate = "";
-			if (\sizeof($this->_form->getValidationParams()) > 0)
-				$noValidate = "novalidate";
+			if (\sizeof($this->_form->getValidationParams()) > 0) {
+							$noValidate = "novalidate";
+			}
 			$this->wrapContent("<form class='" . $this->_form->getProperty('class') . "' id='frm-" . $this->identifier . "' name='frm-" . $this->identifier . "' " . $noValidate . ">", "</form>");
 		}
 	}