phpMv / phpMv-UI

Ajax/semantic/html/base/constants/icons/Animals.php

Spacing +1 added lines, -1 removed lines

@@ -5,5 +5,5 @@
 
 abstract class Animals extends BaseEnum {
 
-	const CAT = 'cat', CROW = 'crow', DOG = 'dog', DOVE = 'dove', DRAGON = 'dragon', FEATHER = 'feather', FEATHER_ALTERNATE = 'feather alternate', FISH = 'fish', FOG = 'frog', HIPPO = 'hippo', HORSE = 'horse', HORSE_HEAD = 'horse head', KIWI_BIRD = 'kiwi bird', OTTER = 'otter', PAW = 'paw', SPIDER = 'spider';
+	const CAT='cat', CROW='crow', DOG='dog', DOVE='dove', DRAGON='dragon', FEATHER='feather', FEATHER_ALTERNATE='feather alternate', FISH='fish', FOG='frog', HIPPO='hippo', HORSE='horse', HORSE_HEAD='horse head', KIWI_BIRD='kiwi bird', OTTER='otter', PAW='paw', SPIDER='spider';
 }

Ajax/semantic/widgets/datatable/DataTable.php

Braces +33 added lines, -22 removed lines

@@ -89,10 +89,12 @@ 
 					"stopPropagation" => true
 				]);
 			}
-			if (\is_array($this->_deleteBehavior))
-				$this->_generateBehavior("delete", $this->_deleteBehavior, $js);
-			if (\is_array($this->_editBehavior))
-				$this->_generateBehavior("edit", $this->_editBehavior, $js);
+			if (\is_array($this->_deleteBehavior)) {
+							$this->_generateBehavior("delete", $this->_deleteBehavior, $js);
+			}
+			if (\is_array($this->_editBehavior)) {
+							$this->_generateBehavior("edit", $this->_editBehavior, $js);
+			}
 			if (\is_array($this->_displayBehavior)) {
 				$this->_generateBehavior("display", $this->_displayBehavior, $js);
 			}
@@ -150,8 +152,9 @@ 
 			$table->setRowCount(0, \count($captions));
 			$this->_generateHeader($table, $captions);
 
-			if (isset($this->_compileParts))
-				$table->setCompileParts($this->_compileParts);
+			if (isset($this->_compileParts)) {
+							$table->setCompileParts($this->_compileParts);
+			}
 
 			$this->_generateContent($table);
 
@@ -189,8 +192,9 @@ 
 	}
 
 	protected function _applyStyleAttributes($table) {
-		if (isset($this->_hiddenColumns))
-			$this->_hideColumns();
+		if (isset($this->_hiddenColumns)) {
+					$this->_hideColumns();
+		}
 		if (isset($this->_colWidths)) {
 			foreach ($this->_colWidths as $colIndex => $width) {
 				$table->setColWidth($colIndex, $width);
@@ -303,8 +307,9 @@ 
 			$field = $ck->getField();
 			$field->setProperty("value", $dataAjax);
 			$field->setProperty("name", "selection[]");
-			if (isset($checkedClass))
-				$field->setClass($checkedClass);
+			if (isset($checkedClass)) {
+							$field->setClass($checkedClass);
+			}
 			\array_unshift($values, $ck);
 		}
 		$result = $table->newRow();
@@ -321,8 +326,9 @@ 
 
 	protected function _generatePagination($table) {
 		if (isset($this->_toolbar)) {
-			if ($this->_toolbarPosition == PositionInTable::FOOTER)
-				$this->_toolbar->setFloated("left");
+			if ($this->_toolbarPosition == PositionInTable::FOOTER) {
+							$this->_toolbar->setFloated("left");
+			}
 		}
 		$footer = $table->getFooter();
 		$footer->mergeCol();
@@ -364,8 +370,9 @@ 
 
 	protected function _getFieldName($index) {
 		$fieldName = parent::_getFieldName($index);
-		if (\is_object($fieldName))
-			$fieldName = "field-" . $index;
+		if (\is_object($fieldName)) {
+					$fieldName = "field-" . $index;
+		}
 		if ($this->_namePrefix != null) {
 			$fieldName = $this->_namePrefix . '.' . $fieldName;
 		}
@@ -557,8 +564,9 @@ 
 
 	protected function getTargetSelector($op) {
 		$result = $this->_targetSelector;
-		if (! isset($result[$op]))
-			$result = "#" . $this->identifier;
+		if (! isset($result[$op])) {
+					$result = "#" . $this->identifier;
+		}
 		return $result[$op];
 	}
 
@@ -581,8 +589,9 @@ 
 	}
 
 	public function getRefreshSelector() {
-		if (isset($this->_refreshSelector))
-			return $this->_refreshSelector;
+		if (isset($this->_refreshSelector)) {
+					return $this->_refreshSelector;
+		}
 		return "#" . $this->identifier . " tbody";
 	}
 
@@ -603,8 +612,9 @@ 
 	 */
 	public function show($modelInstance) {
 		if (\is_array($modelInstance)) {
-			if (isset($modelInstance[0]) && \is_array(array_values($modelInstance)[0]))
-				$modelInstance = \json_decode(\json_encode($modelInstance), FALSE);
+			if (isset($modelInstance[0]) && \is_array(array_values($modelInstance)[0])) {
+							$modelInstance = \json_decode(\json_encode($modelInstance), FALSE);
+			}
 		}
 		$this->_modelInstance = $modelInstance;
 	}
@@ -654,8 +664,9 @@ 
 	}
 
 	public function hideColumn($colIndex) {
-		if (! \is_array($this->_hiddenColumns))
-			$this->_hiddenColumns = [];
+		if (! \is_array($this->_hiddenColumns)) {
+					$this->_hiddenColumns = [];
+		}
 		$this->_hiddenColumns[] = $colIndex;
 		return $this;
 	}

Spacing +128 added lines, -128 removed lines

@@ -25,7 +25,7 @@ 
  *
  */
 class DataTable extends Widget {
-	use TableTrait,DataTableFieldAsTrait,HasCheckboxesTrait,BaseTrait;
+	use TableTrait, DataTableFieldAsTrait, HasCheckboxesTrait, BaseTrait;
 
 	protected $_searchField;
 
@@ -41,7 +41,7 @@ 
 
 	protected $_displayBehavior;
 
-	protected $_visibleHover = false;
+	protected $_visibleHover=false;
 
 	protected $_targetSelector;
 
@@ -51,7 +51,7 @@ 
 
 	protected $_json;
 
-	protected $_rowClass = "_element";
+	protected $_rowClass="_element";
 
 	protected $_sortable;
 
@@ -65,26 +65,26 @@ 
 
 	protected $_namePrefix;
 
-	public function __construct($identifier, $model, $modelInstance = NULL) {
+	public function __construct($identifier, $model, $modelInstance=NULL) {
 		parent::__construct($identifier, $model, $modelInstance);
 		$this->_init(new InstanceViewer($identifier), "table", new HtmlTable($identifier, 0, 0), false);
-		$this->_urls = [];
-		$this->_emptyMessage = new HtmlMessage("", "nothing to display");
+		$this->_urls=[];
+		$this->_emptyMessage=new HtmlMessage("", "nothing to display");
 		$this->_emptyMessage->setIcon("info circle");
 	}
 
 	public function run(JsUtils $js) {
-		if ($this->_runned !== true) {
-			$offset = $js->scriptCount();
+		if ($this->_runned!==true) {
+			$offset=$js->scriptCount();
 			if ($this->_hasCheckboxes && isset($js)) {
 				$this->_runCheckboxes($js);
 			}
 			if ($this->_visibleHover) {
-				$js->execOn("mouseover", "#" . $this->identifier . " tr", "$(event.currentTarget).closest('tr').find('.visibleover').css('visibility', 'visible');", [
+				$js->execOn("mouseover", "#".$this->identifier." tr", "$(event.currentTarget).closest('tr').find('.visibleover').css('visibility', 'visible');", [
 					"preventDefault" => false,
 					"stopPropagation" => true
 				]);
-				$js->execOn("mouseout", "#" . $this->identifier . " tr", "$(event.currentTarget).closest('tr').find('.visibleover').css('visibility', 'hidden');$(event.currentTarget).trigger('visibleoverOut');", [
+				$js->execOn("mouseout", "#".$this->identifier." tr", "$(event.currentTarget).closest('tr').find('.visibleover').css('visibility', 'hidden');$(event.currentTarget).trigger('visibleoverOut');", [
 					"preventDefault" => false,
 					"stopPropagation" => true
 				]);
@@ -101,16 +101,16 @@ 
 				$this->_associatePaginationBehavior($js, $offset);
 			}
 			$this->_associateSearchFieldBehavior($js, $offset);
-			$this->_runned = true;
+			$this->_runned=true;
 		}
 	}
 
 	protected function _generateBehavior($op, $params, JsUtils $js) {
 		if (isset($this->_urls[$op])) {
-			$params = \array_merge($params, [
+			$params=\array_merge($params, [
 				"attr" => "data-ajax"
 			]);
-			$js->ajaxOnClick("#" . $this->identifier . " ._" . $op, $this->_urls[$op], $this->getTargetSelector($op), $params);
+			$js->ajaxOnClick("#".$this->identifier." ._".$op, $this->_urls[$op], $this->getTargetSelector($op), $params);
 		}
 	}
 
@@ -129,21 +129,21 @@ 
 	}
 
 	public function refreshTD($fieldName, $jquery, $view) {
-		$index = $this->_getIndex($fieldName);
+		$index=$this->_getIndex($fieldName);
 		$this->compile($jquery, $view);
 		return $this->refreshTR()
 			->getTable()
 			->getCell(0, $index);
 	}
 
-	public function compile(JsUtils $js = NULL, &$view = NULL) {
-		if (! $this->_generated) {
+	public function compile(JsUtils $js=NULL, &$view=NULL) {
+		if (!$this->_generated) {
 			if (isset($this->_buttonsColumn)) {
 				$this->_instanceViewer->sortColumnContent($this->_buttonsColumn, $this->_buttons);
 			}
 			$this->_instanceViewer->setInstance($this->_model);
-			$captions = $this->_instanceViewer->getCaptions();
-			$table = $this->content["table"];
+			$captions=$this->_instanceViewer->getCaptions();
+			$table=$this->content["table"];
 			if ($this->_hasCheckboxes) {
 				$this->_generateMainCheckbox($captions);
 			}
@@ -158,17 +158,17 @@ 
 			$this->compileExtraElements($table, $captions);
 			$this->_compileSearchFieldBehavior($js);
 
-			$this->content = JArray::sortAssociative($this->content, [
+			$this->content=JArray::sortAssociative($this->content, [
 				PositionInTable::BEFORETABLE,
 				"table",
 				PositionInTable::AFTERTABLE
 			]);
-			if ($this->_caption != null) {
+			if ($this->_caption!=null) {
 				$this->wrap("<div class='field'><label>{$this->_caption}</label>", "</div>");
 			}
 			$this->_compileForm();
 			$this->_applyStyleAttributes($table);
-			$this->_generated = true;
+			$this->_generated=true;
 		}
 		return parent::compile($js, $view);
 	}
@@ -206,9 +206,9 @@ 
 	}
 
 	protected function _generateHeader(HtmlTable $table, $captions) {
-		$gbFields = $this->_instanceViewer->getGroupByFields();
+		$gbFields=$this->_instanceViewer->getGroupByFields();
 		if (\is_array($gbFields)) {
-			$captions = \array_values(JArray::removeByKeys($captions, $gbFields));
+			$captions=\array_values(JArray::removeByKeys($captions, $gbFields));
 		}
 		$table->setHeaderValues($captions);
 		if (isset($this->_sortable)) {
@@ -217,22 +217,22 @@ 
 	}
 
 	protected function _generateContent($table) {
-		$objects = $this->_modelInstance;
+		$objects=$this->_modelInstance;
 		if (isset($this->_pagination)) {
-			$objects = $this->_pagination->getObjects($this->_modelInstance);
+			$objects=$this->_pagination->getObjects($this->_modelInstance);
 		}
 		InstanceViewer::setIndex(0);
-		$fields = $this->_instanceViewer->getSimpleProperties();
-		$groupByFields = $this->_instanceViewer->getGroupByFields();
-		if (! \is_array($groupByFields)) {
-			$table->fromDatabaseObjects($objects, function ($instance) use ($table, $fields) {
+		$fields=$this->_instanceViewer->getSimpleProperties();
+		$groupByFields=$this->_instanceViewer->getGroupByFields();
+		if (!\is_array($groupByFields)) {
+			$table->fromDatabaseObjects($objects, function($instance) use ($table, $fields) {
 				return $this->_generateRow($instance, $fields, $table);
 			});
 		} else {
-			$diffFields = \array_values(JArray::removeByKeys($fields, $groupByFields));
-			$activeValues = \array_combine($groupByFields, \array_fill(0, \count($groupByFields), null));
-			$uuids = [];
-			$table->fromDatabaseObjects($objects, function ($instance) use ($table, $fields, &$activeValues, $groupByFields, &$uuids, $diffFields) {
+			$diffFields=\array_values(JArray::removeByKeys($fields, $groupByFields));
+			$activeValues=\array_combine($groupByFields, \array_fill(0, \count($groupByFields), null));
+			$uuids=[];
+			$table->fromDatabaseObjects($objects, function($instance) use ($table, $fields, &$activeValues, $groupByFields, &$uuids, $diffFields) {
 				$this->_instanceViewer->setInstance($instance);
 				foreach ($groupByFields as $index => $gbField) {
 					$this->_generateGroupByRow($index, $gbField, $table, $fields, $activeValues, $uuids);
@@ -240,8 +240,8 @@ 
 				return $this->_generateRow($instance, $diffFields, $table, null, $uuids);
 			});
 		}
-		if ($table->getRowCount() == 0) {
-			$result = $table->addRow();
+		if ($table->getRowCount()==0) {
+			$result=$table->addRow();
 			$result->mergeCol();
 			$result->setValues([
 				$this->_emptyMessage
@@ -250,20 +250,20 @@ 
 	}
 
 	protected function _generateGroupByRow($index, $gbField, $table, $fields, &$activeValues, &$uuids) {
-		$newValue = $this->_instanceViewer->getValue($gbField);
-		if ($this->getElementContent($activeValues[$gbField]) !== $this->getElementContent($newValue)) {
-			if ($index == 0) {
-				$uuids = [];
+		$newValue=$this->_instanceViewer->getValue($gbField);
+		if ($this->getElementContent($activeValues[$gbField])!==$this->getElementContent($newValue)) {
+			if ($index==0) {
+				$uuids=[];
 			}
-			$uuid = \uniqid("grp");
-			$uuids[$gbField] = $uuid;
-			$id = $this->_instanceViewer->getIdentifier();
-			$result = $table->addMergeRow(\count($fields) + 1, $newValue);
-			$result->setIdentifier($this->identifier . "-tr-gb-" . $id);
+			$uuid=\uniqid("grp");
+			$uuids[$gbField]=$uuid;
+			$id=$this->_instanceViewer->getIdentifier();
+			$result=$table->addMergeRow(\count($fields)+1, $newValue);
+			$result->setIdentifier($this->identifier."-tr-gb-".$id);
 			$result->setProperty("data-ajax", $id);
 			$result->setProperty("data-group", $uuid);
 			$result->addToProperty("class", $this->_rowClass);
-			$activeValues[$gbField] = $newValue;
+			$activeValues[$gbField]=$newValue;
 		}
 	}
 
@@ -275,9 +275,9 @@ 
 	}
 
 	public function getFieldValue($index) {
-		$index = $this->_getIndex($index);
+		$index=$this->_getIndex($index);
 		if (\is_numeric($index)) {
-			$values = $this->_instanceViewer->getValues();
+			$values=$this->_instanceViewer->getValues();
 			if (isset($values[$index])) {
 				return $values[$index];
 			}
@@ -285,30 +285,30 @@ 
 		return null;
 	}
 
-	protected function _generateRow($instance, $fields, &$table, $checkedClass = null, $uuids = null) {
+	protected function _generateRow($instance, $fields, &$table, $checkedClass=null, $uuids=null) {
 		$this->_instanceViewer->setInstance($instance);
-		InstanceViewer::$index ++;
-		$values = $this->_instanceViewer->getValues();
-		$id = $this->_instanceViewer->getIdentifier();
-		$dataAjax = $id;
-		$id = $this->cleanIdentifier($id);
+		InstanceViewer::$index++;
+		$values=$this->_instanceViewer->getValues();
+		$id=$this->_instanceViewer->getIdentifier();
+		$dataAjax=$id;
+		$id=$this->cleanIdentifier($id);
 		if ($this->_hasCheckboxes) {
-			$ck = new HtmlCheckbox("ck-" . $this->identifier . "-" . $id, "");
-			$checked = false;
+			$ck=new HtmlCheckbox("ck-".$this->identifier."-".$id, "");
+			$checked=false;
 			if (isset($this->_checkedCallback)) {
-				$func = $this->_checkedCallback;
-				$checked = $func($instance);
+				$func=$this->_checkedCallback;
+				$checked=$func($instance);
 			}
 			$ck->setChecked($checked);
-			$field = $ck->getField();
+			$field=$ck->getField();
 			$field->setProperty("value", $dataAjax);
 			$field->setProperty("name", "selection[]");
 			if (isset($checkedClass))
 				$field->setClass($checkedClass);
 			\array_unshift($values, $ck);
 		}
-		$result = $table->newRow();
-		$result->setIdentifier($this->identifier . "-tr-" . $id);
+		$result=$table->newRow();
+		$result->setIdentifier($this->identifier."-tr-".$id);
 		$result->setProperty("data-ajax", $dataAjax);
 		$result->setValues($values);
 		$result->addToProperty("class", $this->_rowClass);
@@ -321,67 +321,67 @@ 
 
 	protected function _generatePagination($table) {
 		if (isset($this->_toolbar)) {
-			if ($this->_toolbarPosition == PositionInTable::FOOTER)
+			if ($this->_toolbarPosition==PositionInTable::FOOTER)
 				$this->_toolbar->setFloated("left");
 		}
-		$footer = $table->getFooter();
+		$footer=$table->getFooter();
 		$footer->mergeCol();
-		$this->_paginationToolbar = $this->_pagination->generateMenu($this->identifier);
+		$this->_paginationToolbar=$this->_pagination->generateMenu($this->identifier);
 		$footer->addValues($this->_paginationToolbar);
 	}
 
-	protected function _associatePaginationBehavior(JsUtils $js = NULL, $offset = null) {
+	protected function _associatePaginationBehavior(JsUtils $js=NULL, $offset=null) {
 		if (isset($this->_urls["refresh"])) {
-			$menu = $this->_pagination->getMenu();
+			$menu=$this->_pagination->getMenu();
 			if (isset($menu) && isset($js)) {
-				$js->postOnClick("#" . $menu->getIdentifier() . " .item", $this->_urls["refresh"], "{'p':$(this).attr('data-page'),'_model':'" . JString::doubleBackSlashes($this->_model) . "'}", $this->getRefreshSelector(), [
+				$js->postOnClick("#".$menu->getIdentifier()." .item", $this->_urls["refresh"], "{'p':$(this).attr('data-page'),'_model':'".JString::doubleBackSlashes($this->_model)."'}", $this->getRefreshSelector(), [
 					"preventDefault" => false,
 					"jqueryDone" => "replaceWith",
 					"hasLoader" => false,
-					"jsCallback" => '$("#' . $this->identifier . '").trigger("pageChange");$("#' . $this->identifier . '").trigger("activeRowChange");'
+					"jsCallback" => '$("#'.$this->identifier.'").trigger("pageChange");$("#'.$this->identifier.'").trigger("activeRowChange");'
 				]);
-				$page = $_POST["p"] ?? null;
+				$page=$_POST["p"] ?? null;
 				if (isset($page)) {
-					$activeClass = $this->getActiveRowClass();
-					$js->execAtLast('$("#' . $this->getIdentifier() . ' .pagination").children("a.item").removeClass("' . $activeClass . '");$("#' . $this->getIdentifier() . ' .pagination").children("a.item[data-page=' . $page . ']:not(.no-active)").addClass("' . $activeClass . '");');
+					$activeClass=$this->getActiveRowClass();
+					$js->execAtLast('$("#'.$this->getIdentifier().' .pagination").children("a.item").removeClass("'.$activeClass.'");$("#'.$this->getIdentifier().' .pagination").children("a.item[data-page='.$page.']:not(.no-active)").addClass("'.$activeClass.'");');
 				}
 			}
 		}
 	}
 
-	protected function _compileSearchFieldBehavior(JsUtils $js = NULL) {
+	protected function _compileSearchFieldBehavior(JsUtils $js=NULL) {
 		if (isset($this->_searchField) && isset($js) && isset($this->_urls["refresh"])) {
-			$this->_searchField->postOn("change", $this->_urls["refresh"], "{'s':$(self).val(),'_model':'" . JString::doubleBackSlashes($this->_model) . "'}", "#" . $this->identifier . " tbody", [
+			$this->_searchField->postOn("change", $this->_urls["refresh"], "{'s':$(self).val(),'_model':'".JString::doubleBackSlashes($this->_model)."'}", "#".$this->identifier." tbody", [
 				"preventDefault" => false,
 				"jqueryDone" => "replaceWith",
 				"hasLoader" => "internal",
-				"jsCallback" => '$("#' . $this->identifier . '").trigger("searchTerminate",[$(self).val()]);'
+				"jsCallback" => '$("#'.$this->identifier.'").trigger("searchTerminate",[$(self).val()]);'
 			]);
 		}
 	}
 
-	protected function _associateSearchFieldBehavior(JsUtils $js = NULL, $offset = null) {}
+	protected function _associateSearchFieldBehavior(JsUtils $js=NULL, $offset=null) {}
 
 	protected function _getFieldName($index) {
-		$fieldName = parent::_getFieldName($index);
+		$fieldName=parent::_getFieldName($index);
 		if (\is_object($fieldName))
-			$fieldName = "field-" . $index;
-		if ($this->_namePrefix != null) {
-			$fieldName = $this->_namePrefix . '.' . $fieldName;
+			$fieldName="field-".$index;
+		if ($this->_namePrefix!=null) {
+			$fieldName=$this->_namePrefix.'.'.$fieldName;
 		}
-		return $fieldName . "[]";
+		return $fieldName."[]";
 	}
 
 	protected function _getFieldCaption($index) {
 		return null;
 	}
 
-	protected function applyToolbarPosition(string $position, $table, $captions = NULL) {
+	protected function applyToolbarPosition(string $position, $table, $captions=NULL) {
 		switch ($position) {
 			case PositionInTable::BEFORETABLE:
 			case PositionInTable::AFTERTABLE:
-				if (isset($this->_compileParts) === false) {
-					$this->content[$position] = $this->_toolbar;
+				if (isset($this->_compileParts)===false) {
+					$this->content[$position]=$this->_toolbar;
 				}
 				break;
 			case PositionInTable::HEADER:
@@ -392,7 +392,7 @@ 
 		}
 	}
 
-	protected function _setToolbarPosition($table, $captions = NULL) {
+	protected function _setToolbarPosition($table, $captions=NULL) {
 		if (\is_array($this->_toolbarPosition)) {
 			foreach ($this->_toolbarPosition as $tbp) {
 				$this->applyToolbarPosition($tbp, $table, $captions);
@@ -418,11 +418,11 @@ 
 	}
 
 	private function addToolbarRow($part, $table, $captions) {
-		$hasPart = $table->hasPart($part);
+		$hasPart=$table->hasPart($part);
 		if ($hasPart) {
-			$row = $table->getPart($part)->addRow(\count($captions));
+			$row=$table->getPart($part)->addRow(\count($captions));
 		} else {
-			$row = $table->getPart($part)->getRow(0);
+			$row=$table->getPart($part)->getRow(0);
 		}
 		$row->mergeCol();
 		$row->setValues([
@@ -454,12 +454,12 @@ 
 	 */
 	public function setUrls($urls) {
 		if (\is_array($urls)) {
-			$this->_urls["refresh"] = JArray::getValue($urls, "refresh", 0);
-			$this->_urls["edit"] = JArray::getValue($urls, "edit", 1);
-			$this->_urls["delete"] = JArray::getValue($urls, "delete", 2);
-			$this->_urls["display"] = JArray::getValue($urls, "display", 3);
+			$this->_urls["refresh"]=JArray::getValue($urls, "refresh", 0);
+			$this->_urls["edit"]=JArray::getValue($urls, "edit", 1);
+			$this->_urls["delete"]=JArray::getValue($urls, "delete", 2);
+			$this->_urls["display"]=JArray::getValue($urls, "display", 3);
 		} else {
-			$this->_urls = [
+			$this->_urls=[
 				"refresh" => $urls,
 				"edit" => $urls,
 				"delete" => $urls,
@@ -482,8 +482,8 @@ 
 	 *        	The number of visible pages in the Pagination component
 	 * @return DataTable
 	 */
-	public function paginate($page, $total_rowcount, $items_per_page = 10, $pages_visibles = null) {
-		$this->_pagination = new Pagination($items_per_page, $pages_visibles, $page, $total_rowcount);
+	public function paginate($page, $total_rowcount, $items_per_page=10, $pages_visibles=null) {
+		$this->_pagination=new Pagination($items_per_page, $pages_visibles, $page, $total_rowcount);
 		return $this;
 	}
 
@@ -498,8 +498,8 @@ 
 	 *        	The number of visible pages in the Pagination component
 	 * @return DataTable
 	 */
-	public function autoPaginate($page = 1, $items_per_page = 10, $pages_visibles = 4) {
-		$this->_pagination = new Pagination($items_per_page, $pages_visibles, $page);
+	public function autoPaginate($page=1, $items_per_page=10, $pages_visibles=4) {
+		$this->_pagination=new Pagination($items_per_page, $pages_visibles, $page);
 		return $this;
 	}
 
@@ -508,10 +508,10 @@ 
 	 * @param array $compileParts
 	 * @return DataTable
 	 */
-	public function refresh($compileParts = [
+	public function refresh($compileParts=[
 		'tbody'
 	]) {
-		$this->_compileParts = $compileParts;
+		$this->_compileParts=$compileParts;
 		return $this;
 	}
 
@@ -521,14 +521,14 @@ 
 	 * @param string $position
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
-	public function addSearchInToolbar($position = Direction::RIGHT) {
+	public function addSearchInToolbar($position=Direction::RIGHT) {
 		return $this->addInToolbar($this->getSearchField())
 			->setPosition($position);
 	}
 
 	public function getSearchField() {
-		if (isset($this->_searchField) === false) {
-			$this->_searchField = new HtmlInput("search-" . $this->identifier, "search", "", "Search...");
+		if (isset($this->_searchField)===false) {
+			$this->_searchField=new HtmlInput("search-".$this->identifier, "search", "", "Search...");
 			$this->_searchField->addIcon("search", Direction::RIGHT);
 		}
 		return $this->_searchField;
@@ -556,9 +556,9 @@ 
 	}
 
 	protected function getTargetSelector($op) {
-		$result = $this->_targetSelector;
-		if (! isset($result[$op]))
-			$result = "#" . $this->identifier;
+		$result=$this->_targetSelector;
+		if (!isset($result[$op]))
+			$result="#".$this->identifier;
 		return $result[$op];
 	}
 
@@ -570,20 +570,20 @@ 
 	 * @return DataTable
 	 */
 	public function setTargetSelector($_targetSelector) {
-		if (! \is_array($_targetSelector)) {
-			$_targetSelector = [
+		if (!\is_array($_targetSelector)) {
+			$_targetSelector=[
 				"edit" => $_targetSelector,
 				"delete" => $_targetSelector
 			];
 		}
-		$this->_targetSelector = $_targetSelector;
+		$this->_targetSelector=$_targetSelector;
 		return $this;
 	}
 
 	public function getRefreshSelector() {
 		if (isset($this->_refreshSelector))
 			return $this->_refreshSelector;
-		return "#" . $this->identifier . " tbody";
+		return "#".$this->identifier." tbody";
 	}
 
 	/**
@@ -592,7 +592,7 @@ 
 	 * @return DataTable
 	 */
 	public function setRefreshSelector($_refreshSelector) {
-		$this->_refreshSelector = $_refreshSelector;
+		$this->_refreshSelector=$_refreshSelector;
 		return $this;
 	}
 
@@ -604,9 +604,9 @@ 
 	public function show($modelInstance) {
 		if (\is_array($modelInstance)) {
 			if (isset($modelInstance[0]) && \is_array(array_values($modelInstance)[0]))
-				$modelInstance = \json_decode(\json_encode($modelInstance), FALSE);
+				$modelInstance=\json_decode(\json_encode($modelInstance), FALSE);
 		}
-		$this->_modelInstance = $modelInstance;
+		$this->_modelInstance=$modelInstance;
 	}
 
 	public function getRowClass() {
@@ -620,7 +620,7 @@ 
 	 * @return DataTable
 	 */
 	public function setRowClass($_rowClass) {
-		$this->_rowClass = $_rowClass;
+		$this->_rowClass=$_rowClass;
 		return $this;
 	}
 
@@ -631,16 +631,16 @@ 
 	 * @return DataTable
 	 */
 	public function setEmptyMessage($_emptyMessage) {
-		$this->_emptyMessage = $_emptyMessage;
+		$this->_emptyMessage=$_emptyMessage;
 		return $this;
 	}
 
-	public function setSortable($colIndex = NULL) {
-		$this->_sortable = $colIndex;
+	public function setSortable($colIndex=NULL) {
+		$this->_sortable=$colIndex;
 		return $this;
 	}
 
-	public function setActiveRowSelector($class = "active", $event = "click", $multiple = false) {
+	public function setActiveRowSelector($class="active", $event="click", $multiple=false) {
 		$this->_self->setActiveRowSelector($class, $event, $multiple);
 		return $this;
 	}
@@ -654,19 +654,19 @@ 
 	}
 
 	public function hideColumn($colIndex) {
-		if (! \is_array($this->_hiddenColumns))
-			$this->_hiddenColumns = [];
-		$this->_hiddenColumns[] = $colIndex;
+		if (!\is_array($this->_hiddenColumns))
+			$this->_hiddenColumns=[];
+		$this->_hiddenColumns[]=$colIndex;
 		return $this;
 	}
 
 	public function setColWidth($colIndex, $width) {
-		$this->_colWidths[$colIndex] = $width;
+		$this->_colWidths[$colIndex]=$width;
 		return $this;
 	}
 
 	public function setColWidths($_colWidths) {
-		$this->_colWidths = $_colWidths;
+		$this->_colWidths=$_colWidths;
 		return $this;
 	}
 
@@ -675,7 +675,7 @@ 
 		return $this;
 	}
 
-	public function trigger($event, $params = "[]") {
+	public function trigger($event, $params="[]") {
 		return $this->getHtmlComponent()->trigger($event, $params);
 	}
 
@@ -713,7 +713,7 @@ 
 	 * @param mixed $_displayBehavior
 	 */
 	public function setDisplayBehavior($_displayBehavior) {
-		$this->_displayBehavior = $_displayBehavior;
+		$this->_displayBehavior=$_displayBehavior;
 	}
 
 	/**
@@ -733,8 +733,8 @@ 
 	}
 
 	public function addGroupBy($index) {
-		$index = $this->_getIndex($index);
-		if ($index !== false) {
+		$index=$this->_getIndex($index);
+		if ($index!==false) {
 			$this->_instanceViewer->addGroupBy($index);
 		}
 	}
@@ -744,7 +744,7 @@ 
 	 * @param boolean $_visibleHover
 	 */
 	public function setVisibleHover($_visibleHover) {
-		$this->_visibleHover = $_visibleHover;
+		$this->_visibleHover=$_visibleHover;
 	}
 
 	/**
@@ -755,7 +755,7 @@ 
 		return $this->_paginationToolbar;
 	}
 
-	public function setInverted($recursive = true) {
+	public function setInverted($recursive=true) {
 		$this->getHtmlComponent()->setInverted($recursive);
 		if ($this->_emptyMessage instanceof HtmlSemDoubleElement) {
 			$this->_emptyMessage->setInverted($recursive);
@@ -767,7 +767,7 @@ 
 	}
 
 	public function setFormCaption($caption) {
-		$this->_caption = $caption;
+		$this->_caption=$caption;
 	}
 
 	/**
@@ -783,6 +783,6 @@ 
 	 * @param mixed $namePrefix
 	 */
 	public function setNamePrefix($namePrefix): void {
-		$this->_namePrefix = $namePrefix;
+		$this->_namePrefix=$namePrefix;
 	}
 }

Ajax/semantic/html/collections/table/HtmlTable.php

Spacing +58 added lines, -58 removed lines

@@ -31,7 +31,7 @@ 
 
 	private $_activeRowSelector;
 
-	private $_focusable = false;
+	private $_focusable=false;
 
 	/**
 	 *
@@ -45,19 +45,19 @@ 
 
 	public function __construct($identifier, $rowCount, $colCount) {
 		parent::__construct($identifier, "table", "ui table");
-		$this->content = array();
+		$this->content=array();
 		$this->setRowCount($rowCount, $colCount);
-		$this->_variations = [
+		$this->_variations=[
 			Variation::CELLED,
 			Variation::PADDED,
 			Variation::COMPACT
 		];
-		$this->_compileParts = [
+		$this->_compileParts=[
 			"thead",
 			"tbody",
 			"tfoot"
 		];
-		$this->_afterCompileEvents = [];
+		$this->_afterCompileEvents=[];
 	}
 
 	/**
@@ -67,9 +67,9 @@ 
 	 * @return HtmlTableContent
 	 */
 	public function getPart($key) {
-		if (\array_key_exists($key, $this->content) === false) {
-			$this->content[$key] = new HtmlTableContent("", $key);
-			if ($key !== "tbody") {
+		if (\array_key_exists($key, $this->content)===false) {
+			$this->content[$key]=new HtmlTableContent("", $key);
+			if ($key!=="tbody") {
 				$this->content[$key]->setRowCount(1, $this->_colCount);
 			}
 		}
@@ -126,7 +126,7 @@ 
 	 * @return boolean
 	 */
 	public function hasPart($key) {
-		return \array_key_exists($key, $this->content) === true;
+		return \array_key_exists($key, $this->content)===true;
 	}
 
 	/**
@@ -136,7 +136,7 @@ 
 	 * @return HtmlTableContent
 	 */
 	public function setRowCount($rowCount, $colCount) {
-		$this->_colCount = $colCount;
+		$this->_colCount=$colCount;
 		return $this->getBody()->setRowCount($rowCount, $colCount);
 	}
 
@@ -167,8 +167,8 @@ 
 	 * @param array $values
 	 * @return HtmlTR
 	 */
-	public function addRow($values = array()) {
-		$row = $this->getBody()->addRow($this->_colCount);
+	public function addRow($values=array()) {
+		$row=$this->getBody()->addRow($this->_colCount);
 		$row->setValues(\array_values($values));
 		return $row;
 	}
@@ -189,7 +189,7 @@ 
 	 *        	values in an array of array
 	 * @return HtmlTable
 	 */
-	public function setValues($values = array()) {
+	public function setValues($values=array()) {
 		$this->getBody()->setValues($values);
 		return $this;
 	}
@@ -200,7 +200,7 @@ 
 	 * @param array $values
 	 * @return HtmlTableContent
 	 */
-	public function setHeaderValues($values = array()) {
+	public function setHeaderValues($values=array()) {
 		return $this->getHeader()->setValues($values);
 	}
 
@@ -210,7 +210,7 @@ 
 	 * @param array $values
 	 * @return HtmlTableContent
 	 */
-	public function setFooterValues($values = array()) {
+	public function setFooterValues($values=array()) {
 		return $this->getFooter()->setValues($values);
 	}
 
@@ -221,7 +221,7 @@ 
 	 * @param array $values
 	 * @return HtmlTable
 	 */
-	public function setColValues($colIndex, $values = array()) {
+	public function setColValues($colIndex, $values=array()) {
 		$this->getBody()->setColValues($colIndex, $values);
 		return $this;
 	}
@@ -233,12 +233,12 @@ 
 	 * @param array $values
 	 * @return HtmlTable
 	 */
-	public function setRowValues($rowIndex, $values = array()) {
+	public function setRowValues($rowIndex, $values=array()) {
 		$this->getBody()->setRowValues($rowIndex, $values);
 		return $this;
 	}
 
-	public function addColVariations($colIndex, $variations = array()) {
+	public function addColVariations($colIndex, $variations=array()) {
 		return $this->getBody()->addColVariations($colIndex, $variations);
 	}
 
@@ -305,19 +305,19 @@ 
 	public function setColAlignment($colIndex, $alignment) {
 		switch ($alignment) {
 			case TextAlignment::LEFT:
-				$function = "colLeft";
+				$function="colLeft";
 				break;
 
 			case TextAlignment::RIGHT:
-				$function = "colRight";
+				$function="colRight";
 				break;
 
 			case TextAlignment::CENTER:
-				$function = "colCenter";
+				$function="colCenter";
 				break;
 
 			default:
-				$function = "colLeft";
+				$function="colLeft";
 		}
 		$this->colAlign($colIndex, $function);
 		return $this;
@@ -326,19 +326,19 @@ 
 	public function setColAlignmentFromRight($colIndex, $alignment) {
 		switch ($alignment) {
 			case TextAlignment::LEFT:
-				$function = "colLeftFromRight";
+				$function="colLeftFromRight";
 				break;
 
 			case TextAlignment::RIGHT:
-				$function = "colRightFromRight";
+				$function="colRightFromRight";
 				break;
 
 			case TextAlignment::CENTER:
-				$function = "colCenterFromRight";
+				$function="colCenterFromRight";
 				break;
 
 			default:
-				$function = "colLeftFromRight";
+				$function="colLeftFromRight";
 		}
 		$this->colAlign($colIndex, $function);
 		return $this;
@@ -414,19 +414,19 @@ 
 	 *
 	 * @see HtmlSemDoubleElement::compile()
 	 */
-	public function compile(JsUtils $js = NULL, &$view = NULL) {
-		if (\sizeof($this->_compileParts) < 3) {
-			$this->_template = "%content%";
+	public function compile(JsUtils $js=NULL, &$view=NULL) {
+		if (\sizeof($this->_compileParts)<3) {
+			$this->_template="%content%";
 			$this->refresh($js);
 		}
-		$this->content = JArray::sortAssociative($this->content, $this->_compileParts);
+		$this->content=JArray::sortAssociative($this->content, $this->_compileParts);
 		return parent::compile($js, $view);
 	}
 
-	protected function compile_once(JsUtils $js = NULL, &$view = NULL) {
+	protected function compile_once(JsUtils $js=NULL, &$view=NULL) {
 		parent::compile_once($js, $view);
 		if ($this->propertyContains("class", "sortable")) {
-			$this->addEvent("execute", "$('#" . $this->identifier . "').tablesort().data('tablesort').sort($('th.default-sort'));");
+			$this->addEvent("execute", "$('#".$this->identifier."').tablesort().data('tablesort').sort($('th.default-sort'));");
 		}
 	}
 
@@ -437,11 +437,11 @@ 
 	 * @see BaseHtml::fromDatabaseObject()
 	 */
 	public function fromDatabaseObject($object, $function) {
-		$result = $function($object);
+		$result=$function($object);
 		if (\is_array($result)) {
-			$result = $this->addRow($function($object));
+			$result=$this->addRow($function($object));
 		} else {
-			$result = $this->getBody()->_addRow($result);
+			$result=$this->getBody()->_addRow($result);
 		}
 		if (isset($this->_afterCompileEvents["onNewRow"])) {
 			if (\is_callable($this->_afterCompileEvents["onNewRow"]))
@@ -457,10 +457,10 @@ 
 	 *        	array of thead,tbody,tfoot
 	 * @return HtmlTable
 	 */
-	public function setCompileParts($parts = [
+	public function setCompileParts($parts=[
 		"tbody"
 	]) {
-		$this->_compileParts = $parts;
+		$this->_compileParts=$parts;
 		return $this;
 	}
 
@@ -470,22 +470,22 @@ 
 	}
 
 	public function refresh($js) {
-		$this->_footer = $this->getFooter();
+		$this->_footer=$this->getFooter();
 		if (isset($js)) {
-			$js->exec('$("#' . $this->identifier . ' tfoot").replaceWith("' . \addslashes($this->_footer) . '");', true);
+			$js->exec('$("#'.$this->identifier.' tfoot").replaceWith("'.\addslashes($this->_footer).'");', true);
 		}
 	}
 
 	public function run(JsUtils $js) {
-		if (! $this->_runned) {
+		if (!$this->_runned) {
 			if (isset($this->_activeRowSelector)) {
 				$this->_activeRowSelector->run();
 			}
 		}
-		$result = parent::run($js);
+		$result=parent::run($js);
 		if (isset($this->_footer))
 			$this->_footer->run($js);
-		$this->_runned = true;
+		$this->_runned=true;
 		return $result;
 	}
 
@@ -497,7 +497,7 @@ 
 	 * @return HtmlTable
 	 */
 	public function onNewRow($callback) {
-		$this->_afterCompileEvents["onNewRow"] = $callback;
+		$this->_afterCompileEvents["onNewRow"]=$callback;
 		return $this;
 	}
 
@@ -509,8 +509,8 @@ 
 	 * @param boolean $multiple
 	 * @return HtmlTable
 	 */
-	public function setActiveRowSelector($class = "active", $event = "click", $multiple = false) {
-		$this->_activeRowSelector = new ActiveRow($this, $class, $event, $multiple);
+	public function setActiveRowSelector($class="active", $event="click", $multiple=false) {
+		$this->_activeRowSelector=new ActiveRow($this, $class, $event, $multiple);
 		return $this;
 	}
 
@@ -537,29 +537,29 @@ 
 	}
 
 	public function setColWidth($colIndex, $width) {
-		$part = $this->_getFirstPart();
-		if ($part !== null && $part->count() > 0)
+		$part=$this->_getFirstPart();
+		if ($part!==null && $part->count()>0)
 			$part->getCell(0, $colIndex)->setWidth($width);
 		return $this;
 	}
 
 	public function setColWidths($widths) {
-		$part = $this->_getFirstPart();
-		if ($part !== null && $part->count() > 0) {
-			$count = $part->getColCount();
-			if (! \is_array($widths)) {
-				$widths = \array_fill(0, $count, $widths);
+		$part=$this->_getFirstPart();
+		if ($part!==null && $part->count()>0) {
+			$count=$part->getColCount();
+			if (!\is_array($widths)) {
+				$widths=\array_fill(0, $count, $widths);
 			}
-			$max = \min(\sizeof($widths), $count);
-			for ($i = 0; $i < $max; $i ++) {
+			$max=\min(\sizeof($widths), $count);
+			for ($i=0; $i<$max; $i++) {
 				$part->getCell(0, $i)->setWidth($widths[$i]);
 			}
 		}
 		return $this;
 	}
 
-	public function mergeIdentiqualValues($colIndex, $function = "strip_tags") {
-		$body = $this->getBody();
+	public function mergeIdentiqualValues($colIndex, $function="strip_tags") {
+		$body=$this->getBody();
 		$body->mergeIdentiqualValues($colIndex, $function);
 		return $this;
 	}
@@ -577,7 +577,7 @@ 
 	 * @param mixed $_innerScript
 	 */
 	public function setInnerScript($_innerScript) {
-		$this->_innerScript = $_innerScript;
+		$this->_innerScript=$_innerScript;
 	}
 
 	public function onActiveRowChange($jsCode) {
@@ -585,7 +585,7 @@ 
 		return $this;
 	}
 
-	public function addMergeRow($colCount, $value = null) {
+	public function addMergeRow($colCount, $value=null) {
 		return $this->getBody()->addMergeRow($colCount, $value);
 	}
 

Braces +9 added lines, -6 removed lines

@@ -444,8 +444,9 @@ 
 			$result = $this->getBody()->_addRow($result);
 		}
 		if (isset($this->_afterCompileEvents["onNewRow"])) {
-			if (\is_callable($this->_afterCompileEvents["onNewRow"]))
-				$this->_afterCompileEvents["onNewRow"]($result, $object);
+			if (\is_callable($this->_afterCompileEvents["onNewRow"])) {
+							$this->_afterCompileEvents["onNewRow"]($result, $object);
+			}
 		}
 		return $result;
 	}
@@ -483,8 +484,9 @@ 
 			}
 		}
 		$result = parent::run($js);
-		if (isset($this->_footer))
-			$this->_footer->run($js);
+		if (isset($this->_footer)) {
+					$this->_footer->run($js);
+		}
 		$this->_runned = true;
 		return $result;
 	}
@@ -538,8 +540,9 @@ 
 
 	public function setColWidth($colIndex, $width) {
 		$part = $this->_getFirstPart();
-		if ($part !== null && $part->count() > 0)
-			$part->getCell(0, $colIndex)->setWidth($width);
+		if ($part !== null && $part->count() > 0) {
+					$part->getCell(0, $colIndex)->setWidth($width);
+		}
 		return $this;
 	}
 

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 +226 added lines, -226 removed lines

@@ -15,76 +15,76 @@ 
 
 	protected $ajaxTransition;
 
-	protected $ajaxLoader = "<div class=\"ui active centered inline text loader\">Loading</div>";
+	protected $ajaxLoader="<div class=\"ui active centered inline text loader\">Loading</div>";
 
 	abstract public function getUrl($url);
 
-	abstract public function _add_event($element, $js, $event, $preventDefault = false, $stopPropagation = false, $immediatly = true, $listenerOn = false);
+	abstract public function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false, $immediatly=true, $listenerOn=false);
 
-	abstract public function interval($jsCode, $time, $globalName = null, $immediatly = true);
+	abstract public function interval($jsCode, $time, $globalName=null, $immediatly=true);
 
-	protected function _ajax($method, $url, $responseElement = '', $parameters = []) {
+	protected function _ajax($method, $url, $responseElement='', $parameters=[]) {
 		if (isset($this->params['ajax'])) {
 			extract($this->params['ajax']);
 		}
 		extract($parameters);
 
-		$jsCallback = isset($jsCallback) ? $jsCallback : '';
-		$retour = $this->_getAjaxUrl($url, $attr);
-		$originalSelector = $responseElement;
-		$responseElement = $this->_getResponseElement($responseElement);
-		$retour .= "var self=this;\n";
-		$before = isset($before) ? $before : "";
-		$retour .= $before;
-		if ($hasLoader === true && JString::isNotNull($responseElement)) {
+		$jsCallback=isset($jsCallback) ? $jsCallback : '';
+		$retour=$this->_getAjaxUrl($url, $attr);
+		$originalSelector=$responseElement;
+		$responseElement=$this->_getResponseElement($responseElement);
+		$retour.="var self=this;\n";
+		$before=isset($before) ? $before : "";
+		$retour.=$before;
+		if ($hasLoader===true && JString::isNotNull($responseElement)) {
 			$this->addLoading($retour, $responseElement, $ajaxLoader);
-		} elseif ($hasLoader === 'response') {
+		} elseif ($hasLoader==='response') {
 			$this->addResponseLoading($retour, $responseElement, $ajaxLoader);
-		} elseif ($hasLoader === 'internal-x') {
+		} elseif ($hasLoader==='internal-x') {
 			$this->addLoading($retour, '$(this).closest(".item, .step")', $ajaxLoader);
-		} elseif ($hasLoader === 'internal') {
-			$retour .= "\n$(this).addClass('loading');";
+		} elseif ($hasLoader==='internal') {
+			$retour.="\n$(this).addClass('loading');";
 		} elseif (\is_string($hasLoader)) {
 			$this->addLoading($retour, $hasLoader, $ajaxLoader);
 		}
-		$ajaxParameters = [
+		$ajaxParameters=[
 			"url" => "url",
-			"method" => "'" . \strtoupper($method) . "'"
+			"method" => "'".\strtoupper($method)."'"
 		];
 
-		$ajaxParameters["async"] = ($async ? "true" : "false");
+		$ajaxParameters["async"]=($async ? "true" : "false");
 
 		if (isset($params)) {
-			$ajaxParameters["data"] = self::_correctParams($params, $parameters);
+			$ajaxParameters["data"]=self::_correctParams($params, $parameters);
 		}
 		if (isset($headers)) {
-			$ajaxParameters["headers"] = $headers;
+			$ajaxParameters["headers"]=$headers;
 		}
 		if ($csrf) {
-			$csrf = (is_string($csrf)) ? $csrf : 'csrf-token';
-			$parameters["beforeSend"] = "jqXHR.setRequestHeader('{$csrf}', $('meta[name=\"{$csrf}\"]').attr('content'));";
+			$csrf=(is_string($csrf)) ? $csrf : 'csrf-token';
+			$parameters["beforeSend"]="jqXHR.setRequestHeader('{$csrf}', $('meta[name=\"{$csrf}\"]').attr('content'));";
 		}
 		if (isset($partial)) {
-			$ajaxParameters["xhr"] = "xhrProvider";
-			$retour .= "var xhr = $.ajaxSettings.xhr();function xhrProvider() {return xhr;};xhr.onreadystatechange = function (e) { if (3==e.target.readyState){let response=e.target.responseText;" . $partial . ";}; };";
+			$ajaxParameters["xhr"]="xhrProvider";
+			$retour.="var xhr = $.ajaxSettings.xhr();function xhrProvider() {return xhr;};xhr.onreadystatechange = function (e) { if (3==e.target.readyState){let response=e.target.responseText;".$partial.";}; };";
 		}
 		$this->createAjaxParameters($ajaxParameters, $parameters);
-		$retour .= "$.ajax({" . $this->implodeAjaxParameters($ajaxParameters) . "}).done(function( data, textStatus, jqXHR ) {\n";
-		$retour .= $this->_getOnAjaxDone($responseElement, $jqueryDone, $ajaxTransition, $jsCallback, ($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%}",
@@ -93,21 +93,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;
@@ -115,29 +115,29 @@ 
 
 	protected function _addJsCondition($jsCondition, $jsSource) {
 		if (isset($jsCondition)) {
-			return "if(" . $jsCondition . "){\n" . $jsSource . "\n}";
+			return "if(".$jsCondition."){\n".$jsSource."\n}";
 		}
 		return $jsSource;
 	}
 
 	protected function _getAjaxUrl($url, $attr) {
-		$url = $this->_correctAjaxUrl($url);
-		$retour = "url='" . $url . "';";
-		$slash = "/";
-		if (JString::endswith($url, "/") === true) {
-			$slash = "";
+		$url=$this->_correctAjaxUrl($url);
+		$retour="url='".$url."';";
+		$slash="/";
+		if (JString::endswith($url, "/")===true) {
+			$slash="";
 		}
 
 		if (JString::isNotNull($attr)) {
-			if ($attr === "value") {
-				$retour .= "url=url+'" . $slash . "'+$(this).val();\n";
-			} elseif ($attr === "html") {
-				$retour .= "url=url+'" . $slash . "'+$(this).html();\n";
-			} elseif (\substr($attr, 0, 3) === "js:") {
-				$retour .= "url=url+'" . $slash . "'+" . \substr($attr, 3) . ";\n";
-			} elseif ($attr !== null && $attr !== "") {
-				$retour .= "let elmUrl=$(this).attr('" . $attr . "')||'';";
-				$retour .= "url=(!/^((http|https|ftp):\/\/)/.test(elmUrl))?url+'" . $slash . "'+elmUrl:elmUrl;\n";
+			if ($attr==="value") {
+				$retour.="url=url+'".$slash."'+$(this).val();\n";
+			} elseif ($attr==="html") {
+				$retour.="url=url+'".$slash."'+$(this).html();\n";
+			} elseif (\substr($attr, 0, 3)==="js:") {
+				$retour.="url=url+'".$slash."'+".\substr($attr, 3).";\n";
+			} elseif ($attr!==null && $attr!=="") {
+				$retour.="let elmUrl=$(this).attr('".$attr."')||'';";
+				$retour.="url=(!/^((http|https|ftp):\/\/)/.test(elmUrl))?url+'".$slash."'+elmUrl:elmUrl;\n";
 			}
 		}
 		return $retour;
@@ -147,44 +147,44 @@ 
 		return "window.onpopstate = function(e){if(e.state){var target=e.state.jqueryDone;$(e.state.selector)[target](e.state.html);}};";
 	}
 
-	protected function autoActiveLinks($previousURL = "window.location.href") {
-		$result = "\nfunction getHref(url) { return \$('a').filter(function(){return \$(this).prop('href') == url; });}";
-		$result .= "\nvar myurl={$previousURL};if(window._previousURL) getHref(window._previousURL).removeClass('active');getHref(myurl).addClass('active');window._previousURL=myurl;";
+	protected function autoActiveLinks($previousURL="window.location.href") {
+		$result="\nfunction getHref(url) { return \$('a').filter(function(){return \$(this).prop('href') == url; });}";
+		$result.="\nvar myurl={$previousURL};if(window._previousURL) getHref(window._previousURL).removeClass('active');getHref(myurl).addClass('active');window._previousURL=myurl;";
 		return $result;
 	}
 
-	protected function _getOnAjaxDone($responseElement, $jqueryDone, $ajaxTransition, $jsCallback, $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');";
@@ -192,71 +192,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);
 			};
 		}
@@ -265,13 +265,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;
 	}
 
 	/**
@@ -282,7 +282,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);
 	}
 
@@ -296,8 +296,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);
 	}
 
@@ -313,8 +313,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);
 	}
 
@@ -336,7 +336,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);
 	}
 
@@ -352,8 +352,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);
 	}
 
@@ -367,15 +367,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);
 	}
 
@@ -389,7 +389,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);
 	}
 
@@ -405,7 +405,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,
@@ -425,8 +425,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);
 	}
 
@@ -441,29 +441,29 @@ 
 	 * @param array $parameters
 	 *        	default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","context"=>null,"jsCondition"=>NULL,"headers"=>null,"immediatly"=>false,"rowClass"=>"_json","before"=>null)
 	 */
-	private function _jsonArray($maskSelector, $url, $method = 'get', $parameters = []) {
-		$parameters = \array_merge($parameters, [
+	private function _jsonArray($maskSelector, $url, $method='get', $parameters=[]) {
+		$parameters=\array_merge($parameters, [
 			"hasLoader" => false
 		]);
-		$rowClass = isset($parameters['rowClass']) ? $parameters['rowClass'] : "_json";
-		$jsCallback = isset($parameters['jsCallback']) ? $parameters['jsCallback'] : "";
-		$context = isset($parameters['context']) ? $parameters['context'] : null;
-		if ($context === null) {
-			$parent = "$('" . $maskSelector . "').parent()";
-			$newElm = "$('#'+newId)";
+		$rowClass=isset($parameters['rowClass']) ? $parameters['rowClass'] : "_json";
+		$jsCallback=isset($parameters['jsCallback']) ? $parameters['jsCallback'] : "";
+		$context=isset($parameters['context']) ? $parameters['context'] : null;
+		if ($context===null) {
+			$parent="$('".$maskSelector."').parent()";
+			$newElm="$('#'+newId)";
 		} else {
-			$parent = $context;
-			$newElm = $context . ".find('#'+newId)";
+			$parent=$context;
+			$newElm=$context.".find('#'+newId)";
 		}
-		$appendTo = "\t\tnewElm.appendTo(" . $parent . ");\n";
-		$retour = $parent . ".find('.{$rowClass}').remove();";
-		$retour .= "\tdata=($.isPlainObject(data)||$.isArray(data))?data:JSON.parse(data);\n$.each(data, function(index, value) {\n" . "\tvar created=false;var maskElm=$('" . $maskSelector . "').first();maskElm.hide();" . "\tvar newId=(maskElm.attr('id') || 'mask')+'-'+index;" . "\tvar newElm=" . $newElm . ";\n" . "\tif(!newElm.length){\n" . "\t\tnewElm=maskElm.clone();
+		$appendTo="\t\tnewElm.appendTo(".$parent.");\n";
+		$retour=$parent.".find('.{$rowClass}').remove();";
+		$retour.="\tdata=($.isPlainObject(data)||$.isArray(data))?data:JSON.parse(data);\n$.each(data, function(index, value) {\n"."\tvar created=false;var maskElm=$('".$maskSelector."').first();maskElm.hide();"."\tvar newId=(maskElm.attr('id') || 'mask')+'-'+index;"."\tvar newElm=".$newElm.";\n"."\tif(!newElm.length){\n"."\t\tnewElm=maskElm.clone();
 		newElm.attr('id',newId);\n;newElm.addClass('{$rowClass}').removeClass('_jsonArrayModel');\nnewElm.find('[id]').each(function(){ var newId=$(this).attr('id')+'-'+index;$(this).attr('id',newId).removeClass('_jsonArrayChecked');});\n";
-		$retour .= $appendTo;
-		$retour .= "\t}\n" . "\tfor(var key in value){\n" . "\t\t\tvar html = $('<div />').append($(newElm).clone()).html();\n" . "\t\t\tif(html.indexOf('__'+key+'__')>-1){\n" . "\t\t\t\tcontent=$(html.split('__'+key+'__').join(value[key]));\n" . "\t\t\t\t$(newElm).replaceWith(content);newElm=content;\n" . "\t\t\t}\n" . "\t\tvar sel='[data-id=\"'+key+'\"]';if($(sel,newElm).length){\n" . "\t\t\tvar selElm=$(sel,newElm);\n" . "\t\t\t if(selElm.is('[value]')) { selElm.attr('value',value[key]);selElm.val(value[key]);} else { selElm.html(value[key]); }\n" . "\t\t}\n" . "}\n" . "\t$(newElm).show(true);" . "\n" . "\t$(newElm).removeClass('hide');" . "});\n";
-		$retour .= "\t$(document).trigger('jsonReady',[data]);\n";
-		$retour .= "\t" . $jsCallback;
-		$parameters["jsCallback"] = $retour;
+		$retour.=$appendTo;
+		$retour.="\t}\n"."\tfor(var key in value){\n"."\t\t\tvar html = $('<div />').append($(newElm).clone()).html();\n"."\t\t\tif(html.indexOf('__'+key+'__')>-1){\n"."\t\t\t\tcontent=$(html.split('__'+key+'__').join(value[key]));\n"."\t\t\t\t$(newElm).replaceWith(content);newElm=content;\n"."\t\t\t}\n"."\t\tvar sel='[data-id=\"'+key+'\"]';if($(sel,newElm).length){\n"."\t\t\tvar selElm=$(sel,newElm);\n"."\t\t\t if(selElm.is('[value]')) { selElm.attr('value',value[key]);selElm.val(value[key]);} else { selElm.html(value[key]); }\n"."\t\t}\n"."}\n"."\t$(newElm).show(true);"."\n"."\t$(newElm).removeClass('hide');"."});\n";
+		$retour.="\t$(document).trigger('jsonReady',[data]);\n";
+		$retour.="\t".$jsCallback;
+		$parameters["jsCallback"]=$retour;
 		return $this->_ajax($method, $url, null, $parameters);
 	}
 
@@ -478,7 +478,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);
 	}
 
@@ -493,8 +493,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);
 	}
 
@@ -510,7 +510,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,
@@ -531,8 +531,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);
 	}
 
@@ -551,8 +551,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);
 	}
 
@@ -571,7 +571,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,
@@ -595,7 +595,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);
 	}
 
@@ -612,7 +612,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);
 	}
 
@@ -627,18 +627,18 @@ 
 	 *        	default : array("preventDefault"=>true,"stopPropagation"=>true,"params"=>"{}","jsCallback"=>NULL,"attr"=>"href","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","jsCondition"=>NULL,"headers"=>null,"historize"=>true,"before"=>null,"listenerOn"=>false)
 	 * @return $this
 	 */
-	public function getHref($element, $responseElement = "", $parameters = array()) {
-		$parameters['attr'] = 'href';
+	public function getHref($element, $responseElement="", $parameters=array()) {
+		$parameters['attr']='href';
 		if (JString::isNull($responseElement)) {
-			$responseElement = '%$(self).attr("data-target")%';
+			$responseElement='%$(self).attr("data-target")%';
 		} else {
-			$responseElement = '%$(self).attr("data-target") || "' . $responseElement . '"%';
+			$responseElement='%$(self).attr("data-target") || "'.$responseElement.'"%';
 		}
-		if (! isset($parameters['historize'])) {
-			$parameters['historize'] = true;
+		if (!isset($parameters['historize'])) {
+			$parameters['historize']=true;
 		}
-		if (! isset($parameters['jsCallback'])) {
-			$parameters['jsCallback'] = 'var event = jQuery.Event( "getHref" );event.url = url;$(self).trigger(event);';
+		if (!isset($parameters['jsCallback'])) {
+			$parameters['jsCallback']='var event = jQuery.Event( "getHref" );event.url = url;$(self).trigger(event);';
 		}
 		return $this->getOnClick($element, "", $responseElement, $parameters);
 	}
@@ -654,15 +654,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);
 	}
@@ -678,29 +678,29 @@ 
 	 *        	default : array("preventDefault"=>true,"stopPropagation"=>true,"params"=>"{}","jsCallback"=>NULL,"attr"=>"href","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","jsCondition"=>NULL,"headers"=>null,"historize"=>true,"before"=>null,"listenerOn"=>false)
 	 * @return $this
 	 */
-	public function postFormAction($element, $responseElement = "", $parameters = array()) {
-		$parameters['attr'] = 'action';
+	public function postFormAction($element, $responseElement="", $parameters=array()) {
+		$parameters['attr']='action';
 		if (JString::isNull($responseElement)) {
-			$responseElement = '%$(self).attr("data-target")%';
+			$responseElement='%$(self).attr("data-target")%';
 		} else {
-			$responseElement = '%$(self).attr("data-target") || "' . $responseElement . '"%';
+			$responseElement='%$(self).attr("data-target") || "'.$responseElement.'"%';
 		}
-		$formId = '%$(this).attr("id")%';
-		if (! isset($parameters['historize'])) {
-			$parameters['historize'] = true;
+		$formId='%$(this).attr("id")%';
+		if (!isset($parameters['historize'])) {
+			$parameters['historize']=true;
 		}
-		$parameters['preventDefault'] = true;
-		if (! isset($parameters['hasLoader'])) {
-			$parameters['hasLoader'] = '$(self).find("button, input[type=submit], input[type=button]")';
+		$parameters['preventDefault']=true;
+		if (!isset($parameters['hasLoader'])) {
+			$parameters['hasLoader']='$(self).find("button, input[type=submit], input[type=button]")';
 		}
-		if (! isset($parameters['jsCallback'])) {
-			$parameters['jsCallback'] = 'var event = jQuery.Event( "postFormAction" );event.params = Object.fromEntries(new URLSearchParams(params));$(self).trigger(event);';
+		if (!isset($parameters['jsCallback'])) {
+			$parameters['jsCallback']='var event = jQuery.Event( "postFormAction" );event.params = Object.fromEntries(new URLSearchParams(params));$(self).trigger(event);';
 		}
 		return $this->postFormOn('submit', $element, '', $formId, $responseElement, $parameters);
 	}
 
-	private function _post($url, $params = '{}', $responseElement = '', $parameters = []) {
-		$parameters['params'] = $params;
+	private function _post($url, $params='{}', $responseElement='', $parameters=[]) {
+		$parameters['params']=$params;
 		return $this->_ajax('POST', $url, $responseElement, $parameters);
 	}
 
@@ -716,8 +716,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);
 	}
 
@@ -734,8 +734,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);
 	}
 
@@ -754,9 +754,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);
 	}
 
@@ -774,75 +774,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 .= "\nvar params=$('#'+" . $form . ").serialize();\n";
+		$async=($async) ? 'true' : 'false';
+		$jsCallback=isset($jsCallback) ? $jsCallback : "";
+		$retour=$this->_getAjaxUrl($url, $attr);
+		$form=$this->_getFormElement($form);
+		$retour.="\n$('#'+".$form.").trigger('ajaxSubmit');";
+		if (!isset($contentType) || $contentType!='false') {
+			$retour.="\nvar params=$('#'+".$form.").serialize();\n";
 			if (isset($params)) {
-				$retour .= "params+='&'+" . self::_correctParams($params) . ";\n";
+				$retour.="params+='&'+".self::_correctParams($params).";\n";
 			}
 		} else {
-			$retour .= "\nvar params=new FormData($('#'+" . $form . ")[0]);\n";
+			$retour.="\nvar params=new FormData($('#'+".$form.")[0]);\n";
 		}
-		$responseElement = $this->_getResponseElement($responseElement);
-		$retour .= "var self=this;\n";
-		$before = isset($before) ? $before : "";
-		$retour .= $before;
-		if ($hasLoader === true) {
+		$responseElement=$this->_getResponseElement($responseElement);
+		$retour.="var self=this;\n";
+		$before=isset($before) ? $before : "";
+		$retour.=$before;
+		if ($hasLoader===true) {
 			$this->addLoading($retour, $responseElement, $ajaxLoader);
-		} elseif ($hasLoader === 'response') {
+		} elseif ($hasLoader==='response') {
 			$this->addResponseLoading($retour, $responseElement, $ajaxLoader);
-		} elseif ($hasLoader === 'internal-x') {
+		} elseif ($hasLoader==='internal-x') {
 			$this->addLoading($retour, '$(this).closest(".item, .step")', $ajaxLoader);
-		} elseif ($hasLoader === 'internal') {
-			$retour .= "\n$(this).addClass('loading');";
+		} elseif ($hasLoader==='internal') {
+			$retour.="\n$(this).addClass('loading');";
 		} elseif (\is_string($hasLoader)) {
-			$retour .= "\n$hasLoader.addClass('loading');";
+			$retour.="\n$hasLoader.addClass('loading');";
 		}
-		$ajaxParameters = [
+		$ajaxParameters=[
 			"url" => "url",
 			"method" => "'POST'",
 			"data" => "params",
 			"async" => $async
 		];
 		if (isset($headers)) {
-			$ajaxParameters["headers"] = $headers;
+			$ajaxParameters["headers"]=$headers;
 		}
 		if (isset($partial)) {
-			$ajaxParameters["xhr"] = "xhrProvider";
-			$retour .= "var xhr = $.ajaxSettings.xhr();function xhrProvider() {return xhr;};xhr.onreadystatechange = function (e) { if (3==e.target.readyState){let response=e.target.responseText;" . $partial . ";}; };";
+			$ajaxParameters["xhr"]="xhrProvider";
+			$retour.="var xhr = $.ajaxSettings.xhr();function xhrProvider() {return xhr;};xhr.onreadystatechange = function (e) { if (3==e.target.readyState){let response=e.target.responseText;".$partial.";}; };";
 		}
 		$this->createAjaxParameters($ajaxParameters, $parameters);
-		$retour .= "$.ajax({" . $this->implodeAjaxParameters($ajaxParameters) . "}).done(function( data ) {\n";
-		$retour .= $this->_getOnAjaxDone($responseElement, $jqueryDone, $ajaxTransition, $jsCallback) . "})";
+		$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;
 	}
 
@@ -858,8 +858,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);
 	}
 
@@ -876,8 +876,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);
 	}
 
@@ -894,7 +894,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,
@@ -916,11 +916,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) {