phpMv / phpMv-UI

Ajax/semantic/html/modules/HtmlTab.php

Spacing +45 added lines, -45 removed lines

@@ -18,19 +18,19 @@ 
  */
 class HtmlTab extends HtmlSemCollection {
 
-	protected $params = [];
+	protected $params=[];
 
-	protected $_activated = false;
+	protected $_activated=false;
 
-	public function __construct($identifier, $tabs = array()) {
+	public function __construct($identifier, $tabs=array()) {
 		parent::__construct($identifier, "div", "");
-		$menu = new HtmlMenu("menu" . $this->identifier);
+		$menu=new HtmlMenu("menu".$this->identifier);
 		$menu->asTab(false)->setAttachment(NULL, Side::TOP);
-		$this->content["menu"] = $menu;
+		$this->content["menu"]=$menu;
 		$this->addItems($tabs);
 	}
 	
-	public function getMenu(){
+	public function getMenu() {
 		return $this->content['menu'];
 	}
 
@@ -41,18 +41,18 @@ 
 	 * @return HtmlSegment
 	 */
 	protected function createItem($value) {
-		$count = $this->count();
-		$title = $value;
-		$content = NULL;
+		$count=$this->count();
+		$title=$value;
+		$content=NULL;
 		if (\is_array($value)) {
-			$title = @$value[0];
-			$content = @$value[1];
+			$title=@$value[0];
+			$content=@$value[1];
 		}
-		$menuItem = $this->content["menu"]->addItem($title);
+		$menuItem=$this->content["menu"]->addItem($title);
 		$menuItem->addToProperty("data-tab", $menuItem->getIdentifier());
 		$menuItem->removeProperty("href");
-		$result = $this->createSegment($count, $content, $menuItem->getIdentifier());
-		$result->menuTab = $menuItem;
+		$result=$this->createSegment($count, $content, $menuItem->getIdentifier());
+		$result->menuTab=$menuItem;
 		return $result;
 	}
 
@@ -64,7 +64,7 @@ 
 	 * @return \Ajax\semantic\html\elements\HtmlSegment
 	 */
 	private function createSegment($count, $content, $datatab) {
-		$segment = new HtmlSegment("item-" . $this->identifier . "-" . $count, $content);
+		$segment=new HtmlSegment("item-".$this->identifier."-".$count, $content);
 		$segment->setAttachment(NULL, Side::BOTTOM)
 			->addToProperty("class", "tab")
 			->addToProperty("data-tab", $datatab);
@@ -81,10 +81,10 @@ 
 	 * @return \Ajax\semantic\html\modules\HtmlTab
 	 */
 	public function setTabContent($index, $content) {
-		$menu = $this->content["menu"];
-		if ($index < $menu->count()) {
-			if (isset($this->content[$index]) === false) {
-				$this->content[$index] = $this->createSegment($index, $content, $menu->getItem($index)
+		$menu=$this->content["menu"];
+		if ($index<$menu->count()) {
+			if (isset($this->content[$index])===false) {
+				$this->content[$index]=$this->createSegment($index, $content, $menu->getItem($index)
 					->getIdentifier());
 			} else
 				$this->content[$index]->setContent($content);
@@ -99,8 +99,8 @@ 
 	 * @return \Ajax\semantic\html\modules\HtmlTab
 	 */
 	public function setTabsContent($contents) {
-		$size = \sizeof($contents);
-		for ($i = 0; $i < $size; $i ++) {
+		$size=\sizeof($contents);
+		for ($i=0; $i<$size; $i++) {
 			$this->setTabContent($i, $contents[$i]);
 		}
 		return $this;
@@ -113,11 +113,11 @@ 
 	 * @return \Ajax\semantic\html\modules\HtmlTab
 	 */
 	public function activate($index) {
-		$item = $this->content["menu"]->getItem($index);
-		if ($item != null) {
+		$item=$this->content["menu"]->getItem($index);
+		if ($item!=null) {
 			$item->setActive(true);
 			$this->content[$index]->setActive(true);
-			$this->_activated = true;
+			$this->_activated=true;
 		}
 		return $this;
 	}
@@ -151,9 +151,9 @@ 
 	 * @param array $params
 	 * @return \Ajax\semantic\html\elements\HtmlSegment
 	 */
-	public function forwardTab($index, JsUtils $js, $title, $initialController, $controller, $action, $params = array()) {
+	public function forwardTab($index, JsUtils $js, $title, $initialController, $controller, $action, $params=array()) {
 		if (\array_key_exists($index, $this->content)) {
-			$this->content[$index] = $js->forward($initialController, $controller, $action, $params);
+			$this->content[$index]=$js->forward($initialController, $controller, $action, $params);
 			return $this->content[$index];
 		}
 
@@ -174,9 +174,9 @@ 
 	 *        	The parameters to pass to the view
 	 * @return \Ajax\semantic\html\elements\HtmlSegment
 	 */
-	public function renderViewTab($index, JsUtils $js, $title, $initialController, $viewName, $params = array()) {
+	public function renderViewTab($index, JsUtils $js, $title, $initialController, $viewName, $params=array()) {
 		if (\array_key_exists($index, $this->content)) {
-			$this->content[$index] = $js->renderContent($initialController, $viewName, $params);
+			$this->content[$index]=$js->renderContent($initialController, $viewName, $params);
 			return $this->content[$index];
 		}
 		return $this->addAndRenderViewTab($js, $title, $initialController, $viewName, $params);
@@ -196,10 +196,10 @@ 
 	 * @param array $params
 	 * @return \Ajax\semantic\html\elements\HtmlSegment
 	 */
-	public function addAndForwardTab(JsUtils $js, $title, $initialController, $controller, $action, $params = array()) {
+	public function addAndForwardTab(JsUtils $js, $title, $initialController, $controller, $action, $params=array()) {
 		\ob_start();
 		$js->forward($initialController, $controller, $action, $params);
-		$content = \ob_get_clean();
+		$content=\ob_get_clean();
 		return $this->addTab($title, $content);
 	}
 
@@ -215,11 +215,11 @@ 
 	 *        	The parameters to pass to the view
 	 * @return \Ajax\semantic\html\elements\HtmlSegment
 	 */
-	public function addAndRenderViewTab(JsUtils $js, $title, $initialController, $viewName, $params = array()) {
+	public function addAndRenderViewTab(JsUtils $js, $title, $initialController, $viewName, $params=array()) {
 		return $this->addTab($title, $js->renderContent($initialController, $viewName, $params));
 	}
 
-	public function setPointing($value = Direction::NONE) {
+	public function setPointing($value=Direction::NONE) {
 		return $this->content["menu"]->setPointing($value);
 	}
 
@@ -254,25 +254,25 @@ 
 	 * @return \Ajax\semantic\html\modules\HtmlTab
 	 */
 	public function setMenu($menu) {
-		$contentSize = \sizeof($this->content);
-		for ($i = 0; $i < $contentSize; $i ++) {
-			if ($menu->getItem($i) !== NULL) {
+		$contentSize=\sizeof($this->content);
+		for ($i=0; $i<$contentSize; $i++) {
+			if ($menu->getItem($i)!==NULL) {
 				if (isset($this->content[$i])) {
 					$menu->getItem($i)->addToProperty("data-tab", $this->content[$i]->getProperty("data-tab"));
 				}
 			}
 		}
-		$menuSize = $menu->count();
-		for ($i = 0; $i < $menuSize; $i ++) {
+		$menuSize=$menu->count();
+		for ($i=0; $i<$menuSize; $i++) {
 			$menu->getItem($i)->removeProperty("href");
-			if (isset($this->content[$i]) === false) {
-				$this->content[$i] = $this->createSegment($i, "New content", $menu->getItem($i)
+			if (isset($this->content[$i])===false) {
+				$this->content[$i]=$this->createSegment($i, "New content", $menu->getItem($i)
 					->getIdentifier());
 			}
 			$menu->getItem($i)->addToProperty("data-tab", $this->content[$i]->getProperty("data-tab"));
 		}
 
-		$this->content["menu"] = $menu;
+		$this->content["menu"]=$menu;
 		return $this;
 	}
 
@@ -281,19 +281,19 @@ 
 	 * @see BaseHtml::run()
 	 */
 	public function run(JsUtils $js) {
-		if (isset($this->_bsComponent) === false)
-			$this->_bsComponent = $js->semantic()->tab("#" . $this->identifier . " .item", $this->params);
+		if (isset($this->_bsComponent)===false)
+			$this->_bsComponent=$js->semantic()->tab("#".$this->identifier." .item", $this->params);
 		$this->addEventsOnRun($js);
 		return $this->_bsComponent;
 	}
 
-	public function compile(JsUtils $js = NULL, &$view = NULL) {
-		if (! $this->_activated && $this->content["menu"]->count() > 0 && \sizeof($this->content) > 1)
+	public function compile(JsUtils $js=NULL, &$view=NULL) {
+		if (!$this->_activated && $this->content["menu"]->count()>0 && \sizeof($this->content)>1)
 			$this->activate(0);
 		return parent::compile($js, $view);
 	}
 	
-	public function setInverted($recursive=true){
+	public function setInverted($recursive=true) {
 		parent::setInverted($recursive);
 		$this->content['menu']->addClass('inverted');
 	}

Ajax/common/Widget.php

Spacing +75 added lines, -75 removed lines

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

Ajax/semantic/html/modules/HtmlModal.php

Spacing +51 added lines, -51 removed lines

@@ -15,36 +15,36 @@ 
 	protected $_paramParts=array();
 
 	public function __construct($identifier, $header="", $content="", $actions=null) {
-		parent::__construct($identifier, "div","ui modal");
-		if(isset($header)){
+		parent::__construct($identifier, "div", "ui modal");
+		if (isset($header)) {
 			$this->setHeader($header);
 		}
-		if(isset($content)){
+		if (isset($content)) {
 			$this->setContent($content);
 		}
-		if(isset($actions)){
+		if (isset($actions)) {
 			$this->setActions($actions);
 		}
 	}
 
 	public function setHeader($value) {
-		$this->content["header"]=new HtmlSemDoubleElement("header-" . $this->identifier, "a", "header", $value);
+		$this->content["header"]=new HtmlSemDoubleElement("header-".$this->identifier, "a", "header", $value);
 		return $this;
 	}
 
 	public function setContent($value) {
-		$this->content["content"]=new HtmlSemDoubleElement("content-" . $this->identifier, "div", "content", $value);
+		$this->content["content"]=new HtmlSemDoubleElement("content-".$this->identifier, "div", "content", $value);
 		return $this;
 	}
 
 	public function setActions($actions) {
-		$this->content["actions"]=new HtmlSemDoubleElement("content-" . $this->identifier, "div", "actions");
-		if(\is_array($actions)){
-			foreach ($actions as $action){
+		$this->content["actions"]=new HtmlSemDoubleElement("content-".$this->identifier, "div", "actions");
+		if (\is_array($actions)) {
+			foreach ($actions as $action) {
 				$this->addAction($action);
 			}
 		}
-		else{
+		else {
 			$this->addAction($actions);
 		}
 		return $this;
@@ -54,17 +54,17 @@ 
 	 * @param string|BaseHtml $action
 	 * @return HtmlButton
 	 */
-	public function addAction($action){
-		if(!$action instanceof BaseHtml){
+	public function addAction($action) {
+		if (!$action instanceof BaseHtml) {
 			$class="";
-			if(\array_search($action, ["Okay","Yes","Validate"])!==false){
+			if (\array_search($action, ["Okay", "Yes", "Validate"])!==false) {
 				$class="approve";
 			}
-			if(\array_search($action, ["Close","Cancel","No"])!==false){
+			if (\array_search($action, ["Close", "Cancel", "No"])!==false) {
 				$class="cancel";
 			}
-			$action=new HtmlButton("action-".$this->identifier."-".JArray::count($this->content["actions"]->getContent()),$action);
-			if($class!=="")
+			$action=new HtmlButton("action-".$this->identifier."-".JArray::count($this->content["actions"]->getContent()), $action);
+			if ($class!=="")
 				$action->addToProperty("class", $class);
 		}
 		return $this->addElementInPart($action, "actions");
@@ -74,66 +74,66 @@ 
 	 * @param int $index
 	 * @return HtmlButton
 	 */
-	public function getAction($index){
+	public function getAction($index) {
 		return $this->content["actions"]->getContent()[$index];
 	}
 
-	public function addContent($content,$before=false){
-		$this->content["content"]->addContent($content,$before);
+	public function addContent($content, $before=false) {
+		$this->content["content"]->addContent($content, $before);
 		return $this;
 	}
 
-	public function addImageContent($image,$description=NULL){
+	public function addImageContent($image, $description=NULL) {
 		$content=$this->content["content"];
-		if(isset($description)){
-			$description=new HtmlSemDoubleElement("description-".$this->identifier,"div","description",$description);
-			$content->addContent($description,true);
+		if (isset($description)) {
+			$description=new HtmlSemDoubleElement("description-".$this->identifier, "div", "description", $description);
+			$content->addContent($description, true);
 		}
-		if($image!==""){
-			$img=new HtmlImage("image-".$this->identifier,$image,"","medium");
-			$content->addContent($img,true);
-			$content->addToProperty("class","image");
+		if ($image!=="") {
+			$img=new HtmlImage("image-".$this->identifier, $image, "", "medium");
+			$content->addContent($img, true);
+			$content->addToProperty("class", "image");
 		}
 		return $this;
 	}
 
-	public function addIconContent($icon,$description=NULL){
+	public function addIconContent($icon, $description=NULL) {
 		$content=$this->content["content"];
-		if(isset($description)){
-			$description=new HtmlSemDoubleElement("description-".$this->identifier,"div","description",$description);
-			$content->addContent($description,true);
+		if (isset($description)) {
+			$description=new HtmlSemDoubleElement("description-".$this->identifier, "div", "description", $description);
+			$content->addContent($description, true);
 		}
-		if($icon!==""){
-			$img=new HtmlIcon("image-".$this->identifier,$icon);
-			$content->addContent($img,true);
-			$content->addToProperty("class","image");
+		if ($icon!=="") {
+			$img=new HtmlIcon("image-".$this->identifier, $icon);
+			$content->addContent($img, true);
+			$content->addToProperty("class", "image");
 		}
 		return $this;
 	}
 
-	private function addElementInPart($element,$part) {
+	private function addElementInPart($element, $part) {
 		$this->content[$part]->addContent($element);
 		return $element;
 	}
 
-	public function showDimmer($value){
-		$value=$value?"show":"hide";
+	public function showDimmer($value) {
+		$value=$value ? "show" : "hide";
 		$this->_paramParts[]=["'".$value." dimmer'"];
 		return $this;
 	}
 
-	public function setInverted($recursive=true){
+	public function setInverted($recursive=true) {
 		$this->_params["inverted"]=true;
 		return $this;
 	}
 
-	public function setBasic(){
+	public function setBasic() {
 		return $this->addToProperty("class", "basic");
 	}
 
 
-	public function setTransition($value){
-		$this->_paramParts[]=["'setting'","'transition'","'".$value."'"];
+	public function setTransition($value) {
+		$this->_paramParts[]=["'setting'", "'transition'", "'".$value."'"];
 	}
 
 	/**
@@ -143,8 +143,8 @@ 
 	 * @param string $viewName
 	 * @param array $params The parameters to pass to the view
 	 */
-	public function renderView(JsUtils $js,$initialController,$viewName, $params=array()) {
-		return $this->setContent($js->renderContent($initialController, $viewName,$params));
+	public function renderView(JsUtils $js, $initialController, $viewName, $params=array()) {
+		return $this->setContent($js->renderContent($initialController, $viewName, $params));
 	}
 
 	/**
@@ -155,8 +155,8 @@ 
 	 * @param string $actionName the action name
 	 * @param array $params
 	 */
-	public function forward(JsUtils $js,$initialControllerInstance,$controllerName,$actionName,$params=NULL){
-		return $this->setContent($js->forward($initialControllerInstance, $controllerName, $actionName,$params));
+	public function forward(JsUtils $js, $initialControllerInstance, $controllerName, $actionName, $params=NULL) {
+		return $this->setContent($js->forward($initialControllerInstance, $controllerName, $actionName, $params));
 	}
 
 	/**
@@ -166,8 +166,8 @@ 
 	 * @see \Ajax\semantic\html\base\HtmlSemDoubleElement::compile()
 	 */
 	public function compile(JsUtils $js=NULL, &$view=NULL) {
-		$this->content=JArray::sortAssociative($this->content, ["header","content","actions" ]);
-		if(isset($this->_params["inverted"]) && $this->_params["inverted"]){
+		$this->content=JArray::sortAssociative($this->content, ["header", "content", "actions"]);
+		if (isset($this->_params["inverted"]) && $this->_params["inverted"]) {
 			parent::setInverted(true);
 		}
 		return parent::compile($js, $view);
@@ -177,8 +177,8 @@ 
 	 * @see BaseHtml::run()
 	 */
 	public function run(JsUtils $js) {
-		if(isset($this->_bsComponent)===false)
-			$this->_bsComponent=$js->semantic()->modal("#".$this->identifier,$this->_params,$this->_paramParts);
+		if (isset($this->_bsComponent)===false)
+			$this->_bsComponent=$js->semantic()->modal("#".$this->identifier, $this->_params, $this->_paramParts);
 		$this->addEventsOnRun($js);
 		return $this->_bsComponent;
 	}
@@ -191,7 +191,7 @@ 
 		return $this->jsDo("hide");
 	}
 
-	public function onHidden($js){
+	public function onHidden($js) {
 		$this->_params["onHidden"]=$js;
 	}
 }

Ajax/semantic/widgets/dataform/DataForm.php

Spacing +40 added lines, -40 removed lines

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

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

Spacing +50 added lines, -50 removed lines

@@ -31,10 +31,10 @@ 
 
 	public function __construct($identifier, $rowCount, $colCount) {
 		parent::__construct($identifier, "table", "ui table");
-		$this->content=array ();
+		$this->content=array();
 		$this->setRowCount($rowCount, $colCount);
-		$this->_variations=[ Variation::CELLED,Variation::PADDED,Variation::COMPACT ];
-		$this->_compileParts=["thead","tbody","tfoot"];
+		$this->_variations=[Variation::CELLED, Variation::PADDED, Variation::COMPACT];
+		$this->_compileParts=["thead", "tbody", "tfoot"];
 		$this->_afterCompileEvents=[];
 	}
 
@@ -44,17 +44,17 @@ 
 	 * @return HtmlTableContent
 	 */
 	public function getPart($key) {
-		if (\array_key_exists($key, $this->content) === false) {
+		if (\array_key_exists($key, $this->content)===false) {
 			$this->content[$key]=new HtmlTableContent("", $key);
-			if ($key !== "tbody") {
+			if ($key!=="tbody") {
 				$this->content[$key]->setRowCount(1, $this->_colCount);
 			}
 		}
 		return $this->content[$key];
 	}
 
-	protected function _getFirstPart(){
-		if(isset($this->content["thead"])){
+	protected function _getFirstPart() {
+		if (isset($this->content["thead"])) {
 			return $this->content["thead"];
 		}
 		return $this->content["tbody"];
@@ -99,7 +99,7 @@ 
 	 * @return boolean
 	 */
 	public function hasPart($key) {
-		return \array_key_exists($key, $this->content) === true;
+		return \array_key_exists($key, $this->content)===true;
 	}
 
 	/**
@@ -259,8 +259,8 @@ 
 		return $this->colAlign($colIndex, "colLeftFromRight");
 	}
 
-	public function setColAlignment($colIndex,$alignment){
-		switch ($alignment){
+	public function setColAlignment($colIndex, $alignment) {
+		switch ($alignment) {
 			case TextAlignment::LEFT:
 				$function="colLeft";
 				break;
@@ -280,8 +280,8 @@ 
 		return $this;
 	}
 	
-	public function setColAlignmentFromRight($colIndex,$alignment){
-		switch ($alignment){
+	public function setColAlignmentFromRight($colIndex, $alignment) {
+		switch ($alignment) {
 			case TextAlignment::LEFT:
 				$function="colLeftFromRight";
 				break;
@@ -303,7 +303,7 @@ 
 
 	private function colAlign($colIndex, $function) {
 		if (\is_array($colIndex)) {
-			foreach ( $colIndex as $cIndex ) {
+			foreach ($colIndex as $cIndex) {
 				$this->colAlign($cIndex, $function);
 			}
 		} else {
@@ -364,7 +364,7 @@ 
 	 * @see HtmlSemDoubleElement::compile()
 	 */
 	public function compile(JsUtils $js=NULL, &$view=NULL) {
-		if(\sizeof($this->_compileParts)<3){
+		if (\sizeof($this->_compileParts)<3) {
 			$this->_template="%content%";
 			$this->refresh($js);
 		}
@@ -373,9 +373,9 @@ 
 	}
 
 	protected function compile_once(JsUtils $js=NULL, &$view=NULL) {
-		parent::compile_once($js,$view);
+		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'));");
 		}
 	}
 
@@ -388,13 +388,13 @@ 
 	public function fromDatabaseObject($object, $function) {
 		$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"]))
-				$this->_afterCompileEvents["onNewRow"]($result,$object);
+		if (isset($this->_afterCompileEvents["onNewRow"])) {
+			if (\is_callable($this->_afterCompileEvents["onNewRow"]))
+				$this->_afterCompileEvents["onNewRow"]($result, $object);
 		}
 		return $result;
 	}
@@ -409,26 +409,26 @@ 
 		return $this;
 	}
 	
-	public function refreshTR(){
+	public function refreshTR() {
 		$this->setCompileParts();
 		$this->getPart("tbody")->refreshTR();
 	}
 
-	public function refresh($js){
+	public function refresh($js) {
 		$this->_footer=$this->getFooter();
-		if(isset($js)){
-			$js->exec('$("#'.$this->identifier.' tfoot").replaceWith("'.\addslashes($this->_footer).'");',true);
+		if (isset($js)) {
+			$js->exec('$("#'.$this->identifier.' tfoot").replaceWith("'.\addslashes($this->_footer).'");', true);
 		}
 	}
 
-	public function run(JsUtils $js){
-		if(!$this->_runned){
-			if(isset($this->_activeRowSelector)){
+	public function run(JsUtils $js) {
+		if (!$this->_runned) {
+			if (isset($this->_activeRowSelector)) {
 				$this->_activeRowSelector->run();
 			}
 		}
-		$result= parent::run($js);
-		if(isset($this->_footer))
+		$result=parent::run($js);
+		if (isset($this->_footer))
 			$this->_footer->run($js);
 		$this->_runned=true;
 		return $result;
@@ -452,51 +452,51 @@ 
 	 * @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;
 	}
 	
-	public function hasActiveRowSelector(){
+	public function hasActiveRowSelector() {
 		return isset($this->_activeRowSelector);
 	}
 
-	public function hideColumn($colIndex){
-		if(isset($this->content["thead"])){
+	public function hideColumn($colIndex) {
+		if (isset($this->content["thead"])) {
 			$this->content["thead"]->hideColumn($colIndex);
 		}
 		$this->content["tbody"]->hideColumn($colIndex);
-		if(isset($this->content["tfoot"])){
+		if (isset($this->content["tfoot"])) {
 			$this->content["tfoot"]->hideColumn($colIndex);
 		}
 		return $this;
 	}
 
-	public function setColWidth($colIndex,$width){
+	public function setColWidth($colIndex, $width) {
 		$part=$this->_getFirstPart();
-		if($part!==null && $part->count()>0)
+		if ($part!==null && $part->count()>0)
 			$part->getCell(0, $colIndex)->setWidth($width);
 		return $this;
 	}
 
-	public function setColWidths($widths){
+	public function setColWidths($widths) {
 		$part=$this->_getFirstPart();
-		if($part!==null && $part->count()>0){
+		if ($part!==null && $part->count()>0) {
 			$count=$part->getColCount();
-			if(!\is_array($widths)){
+			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"){
+	public function mergeIdentiqualValues($colIndex, $function="strip_tags") {
 		$body=$this->getBody();
-		$body->mergeIdentiqualValues($colIndex,$function);
+		$body->mergeIdentiqualValues($colIndex, $function);
 		return $this;
 	}
 	/**
@@ -510,16 +510,16 @@ 
 	 * @param mixed $_innerScript
 	 */
 	public function setInnerScript($_innerScript) {
-		$this->_innerScript = $_innerScript;
+		$this->_innerScript=$_innerScript;
 	}
 	
-	public function onActiveRowChange($jsCode){
-		$this->on("activeRowChange",$jsCode);
+	public function onActiveRowChange($jsCode) {
+		$this->on("activeRowChange", $jsCode);
 		return $this;
 	}
 	
-	public function addMergeRow($colCount,$value=null){
-		return $this->getBody()->addMergeRow($colCount,$value);
+	public function addMergeRow($colCount, $value=null) {
+		return $this->getBody()->addMergeRow($colCount, $value);
 	}
 
 }

Ajax/semantic/widgets/datatable/DataTable.php

Spacing +117 added lines, -117 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;
 
@@ -61,26 +61,26 @@ 
 	
 	protected $_paginationToolbar;
 
-	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
 				]);
@@ -96,16 +96,16 @@ 
 			if (isset($this->_pagination))
 				$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);
 		}
 	}
 
@@ -124,21 +124,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);
 			}
@@ -153,14 +153,14 @@ 
 			$this->compileExtraElements($table, $captions);
 			$this->_compileSearchFieldBehavior($js);
 
-			$this->content = JArray::sortAssociative($this->content, [
+			$this->content=JArray::sortAssociative($this->content, [
 				PositionInTable::BEFORETABLE,
 				"table",
 				PositionInTable::AFTERTABLE
 			]);
 			$this->_compileForm();
 			$this->_applyStyleAttributes($table);
-			$this->_generated = true;
+			$this->_generated=true;
 		}
 		return parent::compile($js, $view);
 	}
@@ -205,21 +205,21 @@ 
 	}
 
 	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 {
-			$activeValues = array_combine($groupByFields, array_fill(0, sizeof($groupByFields), null));
-			$uuids = [];
-			$table->fromDatabaseObjects($objects, function ($instance) use ($table, $fields, &$activeValues, $groupByFields, &$uuids) {
+			$activeValues=array_combine($groupByFields, array_fill(0, sizeof($groupByFields), null));
+			$uuids=[];
+			$table->fromDatabaseObjects($objects, function($instance) use ($table, $fields, &$activeValues, $groupByFields, &$uuids) {
 				$this->_instanceViewer->setInstance($instance);
 				foreach ($groupByFields as $index => $gbField) {
 					$this->_generateGroupByRow($index, $gbField, $table, $fields, $activeValues, $uuids);
@@ -227,8 +227,8 @@ 
 				return $this->_generateRow($instance, $fields, $table, null, $uuids);
 			});
 		}
-		if ($table->getRowCount() == 0) {
-			$result = $table->addRow();
+		if ($table->getRowCount()==0) {
+			$result=$table->addRow();
 			$result->mergeRow();
 			$result->setValues([
 				$this->_emptyMessage
@@ -237,20 +237,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(sizeof($fields) + 1, $newValue);
-			$result->setIdentifier($this->identifier . "-tr-gb-" . $id);
+			$uuid=uniqid("grp");
+			$uuids[$gbField]=$uuid;
+			$id=$this->_instanceViewer->getIdentifier();
+			$result=$table->addMergeRow(sizeof($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;
 		}
 	}
 
@@ -262,9 +262,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];
 			}
@@ -272,31 +272,31 @@ 
 		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);
 			// $ck->setOnChange("event.stopPropagation();");
-			$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);
@@ -309,63 +309,63 @@ 
 
 	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);
 		$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)) {
-					$js->execAtLast('$("#' . $this->getIdentifier() . ' .pagination").children("a.item").removeClass("active");$("#' . $this->getIdentifier() . ' .pagination").children("a.item[data-page=' . $page . ']:not(.no-active)").addClass("active");');
+					$js->execAtLast('$("#'.$this->getIdentifier().' .pagination").children("a.item").removeClass("active");$("#'.$this->getIdentifier().' .pagination").children("a.item[data-page='.$page.']:not(.no-active)").addClass("active");');
 				}
 			}
 		}
 	}
 
-	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;
-		return $fieldName . "[]";
+			$fieldName="field-".$index;
+		return $fieldName."[]";
 	}
 
 	protected function _getFieldCaption($index) {
 		return null;
 	}
 
-	protected function _setToolbarPosition($table, $captions = NULL) {
+	protected function _setToolbarPosition($table, $captions=NULL) {
 		switch ($this->_toolbarPosition) {
 			case PositionInTable::BEFORETABLE:
 			case PositionInTable::AFTERTABLE:
-				if (isset($this->_compileParts) === false) {
-					$this->content[$this->_toolbarPosition] = $this->_toolbar;
+				if (isset($this->_compileParts)===false) {
+					$this->content[$this->_toolbarPosition]=$this->_toolbar;
 				}
 				break;
 			case PositionInTable::HEADER:
@@ -392,11 +392,11 @@ 
 	}
 
 	private function addToolbarRow($part, $table, $captions) {
-		$hasPart = $table->hasPart($part);
+		$hasPart=$table->hasPart($part);
 		if ($hasPart) {
-			$row = $table->getPart($part)->addRow(\sizeof($captions));
+			$row=$table->getPart($part)->addRow(\sizeof($captions));
 		} else {
-			$row = $table->getPart($part)->getRow(0);
+			$row=$table->getPart($part)->getRow(0);
 		}
 		$row->mergeCol();
 		$row->setValues([
@@ -428,12 +428,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,
@@ -456,8 +456,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;
 	}
 
@@ -472,8 +472,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;
 	}
 
@@ -482,8 +482,8 @@ 
 	 * @param array $compileParts
 	 * @return DataTable
 	 */
-	public function refresh($compileParts = ['tbody']) {
-		$this->_compileParts = $compileParts;
+	public function refresh($compileParts=['tbody']) {
+		$this->_compileParts=$compileParts;
 		return $this;
 	}
 
@@ -493,14 +493,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;
@@ -528,9 +528,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];
 	}
 
@@ -542,20 +542,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";
 	}
 
 	/**
@@ -564,7 +564,7 @@ 
 	 * @return DataTable
 	 */
 	public function setRefreshSelector($_refreshSelector) {
-		$this->_refreshSelector = $_refreshSelector;
+		$this->_refreshSelector=$_refreshSelector;
 		return $this;
 	}
 
@@ -576,9 +576,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() {
@@ -592,7 +592,7 @@ 
 	 * @return DataTable
 	 */
 	public function setRowClass($_rowClass) {
-		$this->_rowClass = $_rowClass;
+		$this->_rowClass=$_rowClass;
 		return $this;
 	}
 
@@ -603,38 +603,38 @@ 
 	 * @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;
 	}
 	
-	public function hasActiveRowSelector(){
+	public function hasActiveRowSelector() {
 		return $this->_self->hasActiveRowSelector();
 	}
 
 	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;
 	}
 
@@ -643,7 +643,7 @@ 
 		return $this;
 	}
 
-	public function trigger($event, $params = "[]") {
+	public function trigger($event, $params="[]") {
 		return $this->getHtmlComponent()->trigger($event, $params);
 	}
 
@@ -681,7 +681,7 @@ 
 	 * @param mixed $_displayBehavior
 	 */
 	public function setDisplayBehavior($_displayBehavior) {
-		$this->_displayBehavior = $_displayBehavior;
+		$this->_displayBehavior=$_displayBehavior;
 	}
 
 	/**
@@ -705,7 +705,7 @@ 
 	 * @param boolean $_visibleHover
 	 */
 	public function setVisibleHover($_visibleHover) {
-		$this->_visibleHover = $_visibleHover;
+		$this->_visibleHover=$_visibleHover;
 	}
 	/**
 	 * @return \Ajax\semantic\html\collections\menus\HtmlPaginationMenu
@@ -714,9 +714,9 @@ 
 		return $this->_paginationToolbar;
 	}
 	
-	public function setInverted($recursive=true){
+	public function setInverted($recursive=true) {
 		$this->getHtmlComponent()->setInverted($recursive);
-		if($this->_emptyMessage instanceof HtmlSemDoubleElement){
+		if ($this->_emptyMessage instanceof HtmlSemDoubleElement) {
 			$this->_emptyMessage->setInverted($recursive);
 		}
 	}

Ajax/common/traits/JsUtilsAjaxTrait.php

Spacing +202 added lines, -202 removed lines

@@ -15,69 +15,69 @@ 
 
 	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")', $ajaxLoader);
-		} elseif ($hasLoader === 'internal') {
-			$retour .= "\n$(this).addClass('loading');";
+		} elseif ($hasLoader==='internal') {
+			$retour.="\n$(this).addClass('loading');";
 		}
-		$ajaxParameters = [
+		$ajaxParameters=[
 			"url" => "url",
-			"method" => "'" . \strtoupper($method) . "'"
+			"method" => "'".\strtoupper($method)."'"
 		];
 
-		$ajaxParameters["async"] = ($async ? "true" : "false");
+		$ajaxParameters["async"]=($async ? "true" : "false");
 
 		if (isset($params)) {
-			$ajaxParameters["data"] = self::_correctParams($params, $parameters);
+			$ajaxParameters["data"]=self::_correctParams($params, $parameters);
 		}
 		if (isset($headers)) {
-			$ajaxParameters["headers"] = $headers;
+			$ajaxParameters["headers"]=$headers;
 		}
 		if ($csrf) {
-			$csrf = (is_string($csrf)) ? $csrf : 'csrf-token';
-			$parameters["beforeSend"] = "jqXHR.setRequestHeader('{$csrf}', $('meta[name=\"{$csrf}\"]').attr('content'));";
+			$csrf=(is_string($csrf)) ? $csrf : 'csrf-token';
+			$parameters["beforeSend"]="jqXHR.setRequestHeader('{$csrf}', $('meta[name=\"{$csrf}\"]').attr('content'));";
 		}
 		if (isset($partial)) {
-			$ajaxParameters["xhr"] = "xhrProvider";
-			$retour .= "var xhr = $.ajaxSettings.xhr();function xhrProvider() {return xhr;};xhr.onreadystatechange = function (e) { if (3==e.target.readyState){let response=e.target.responseText;" . $partial . ";}; };";
+			$ajaxParameters["xhr"]="xhrProvider";
+			$retour.="var xhr = $.ajaxSettings.xhr();function xhrProvider() {return xhr;};xhr.onreadystatechange = function (e) { if (3==e.target.readyState){let response=e.target.responseText;".$partial.";}; };";
 		}
 		$this->createAjaxParameters($ajaxParameters, $parameters);
-		$retour .= "$.ajax({" . $this->implodeAjaxParameters($ajaxParameters) . "}).done(function( data, textStatus, jqXHR ) {\n";
-		$retour .= $this->_getOnAjaxDone($responseElement, $jqueryDone, $ajaxTransition, $jsCallback, $hasLoader, ($historize ? $originalSelector : null)) . "});\n";
+		$retour.="$.ajax({".$this->implodeAjaxParameters($ajaxParameters)."}).done(function( data, textStatus, jqXHR ) {\n";
+		$retour.=$this->_getOnAjaxDone($responseElement, $jqueryDone, $ajaxTransition, $jsCallback, $hasLoader, ($historize ? $originalSelector : null))."});\n";
 
-		$retour = $this->_addJsCondition($jsCondition, $retour);
+		$retour=$this->_addJsCondition($jsCondition, $retour);
 		if ($immediatly)
-			$this->jquery_code_for_compile[] = $retour;
+			$this->jquery_code_for_compile[]=$retour;
 		return $retour;
 	}
 
 	protected function createAjaxParameters(&$original, $parameters) {
-		$validParameters = [
+		$validParameters=[
 			"contentType" => "%value%",
 			"dataType" => "'%value%'",
 			"beforeSend" => "function(jqXHR,settings){%value%}",
@@ -86,21 +86,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;
@@ -108,27 +108,27 @@ 
 
 	protected function _addJsCondition($jsCondition, $jsSource) {
 		if (isset($jsCondition)) {
-			return "if(" . $jsCondition . "){\n" . $jsSource . "\n}";
+			return "if(".$jsCondition."){\n".$jsSource."\n}";
 		}
 		return $jsSource;
 	}
 
 	protected function _getAjaxUrl($url, $attr) {
-		$url = $this->_correctAjaxUrl($url);
-		$retour = "url='" . $url . "';";
-		$slash = "/";
-		if (JString::endswith($url, "/") === true) {
-			$slash = "";
+		$url=$this->_correctAjaxUrl($url);
+		$retour="url='".$url."';";
+		$slash="/";
+		if (JString::endswith($url, "/")===true) {
+			$slash="";
 		}
 		if (JString::isNotNull($attr)) {
-			if ($attr === "value") {
-				$retour .= "url=url+'" . $slash . "'+$(this).val();\n";
-			} elseif ($attr === "html") {
-				$retour .= "url=url+'" . $slash . "'+$(this).html();\n";
-			} elseif (\substr($attr, 0, 3) === "js:") {
-				$retour .= "url=url+'" . $slash . "'+" . \substr($attr, 3) . ";\n";
-			} elseif ($attr !== null && $attr !== "")
-				$retour .= "url=url+'" . $slash . "'+($(this).attr('" . $attr . "')||'');\n";
+			if ($attr==="value") {
+				$retour.="url=url+'".$slash."'+$(this).val();\n";
+			} elseif ($attr==="html") {
+				$retour.="url=url+'".$slash."'+$(this).html();\n";
+			} elseif (\substr($attr, 0, 3)==="js:") {
+				$retour.="url=url+'".$slash."'+".\substr($attr, 3).";\n";
+			} elseif ($attr!==null && $attr!=="")
+				$retour.="url=url+'".$slash."'+($(this).attr('".$attr."')||'');\n";
 		}
 		return $retour;
 	}
@@ -137,101 +137,101 @@ 
 		return "window.onpopstate = function(e){if(e.state){var target=e.state.jqueryDone;$(e.state.selector)[target](e.state.html);}};";
 	}
 
-	protected function autoActiveLinks($previousURL = "window.location.href") {
-		$result = "\nfunction getHref(url) { return \$('a').filter(function(){return \$(this).prop('href') == url; });}";
-		$result .= "\nvar myurl={$previousURL};if(window._previousURL) getHref(window._previousURL).removeClass('active');getHref(myurl).addClass('active');window._previousURL=myurl;";
+	protected function autoActiveLinks($previousURL="window.location.href") {
+		$result="\nfunction getHref(url) { return \$('a').filter(function(){return \$(this).prop('href') == url; });}";
+		$result.="\nvar myurl={$previousURL};if(window._previousURL) getHref(window._previousURL).removeClass('active');getHref(myurl).addClass('active');window._previousURL=myurl;";
 		return $result;
 	}
 
-	protected function _getOnAjaxDone($responseElement, $jqueryDone, $ajaxTransition, $jsCallback, $hasLoader = false, $history = null) {
-		$retour = "";
-		$call = null;
+	protected function _getOnAjaxDone($responseElement, $jqueryDone, $ajaxTransition, $jsCallback, $hasLoader=false, $history=null) {
+		$retour="";
+		$call=null;
 		if (JString::isNotNull($responseElement)) {
 			if (isset($ajaxTransition)) {
-				$call = $this->setAjaxDataCall($ajaxTransition);
+				$call=$this->setAjaxDataCall($ajaxTransition);
 			} elseif (isset($this->ajaxTransition)) {
-				$call = $this->ajaxTransition;
+				$call=$this->ajaxTransition;
 			}
 			if (\is_callable($call))
-				$retour = "\t" . $call($responseElement, $jqueryDone) . ";\n";
+				$retour="\t".$call($responseElement, $jqueryDone).";\n";
 			else
-				$retour = "\t{$responseElement}.{$jqueryDone}( data );\n";
+				$retour="\t{$responseElement}.{$jqueryDone}( data );\n";
 		}
 		if (isset($history)) {
 			if ($this->params["autoActiveLinks"]) {
-				$retour .= $this->autoActiveLinks("url");
+				$retour.=$this->autoActiveLinks("url");
 			}
-			$retour .= "\nwindow.history.pushState({'html':data,'selector':" . Javascript::prep_value($history) . ",'jqueryDone':'{$jqueryDone}'},'', url);";
+			$retour.="\nwindow.history.pushState({'html':data,'selector':".Javascript::prep_value($history).",'jqueryDone':'{$jqueryDone}'},'', url);";
 		}
-		if ($hasLoader === 'internal') {
-			$retour .= "\n$(self).removeClass('loading');";
-		} elseif ($hasLoader === 'internal-x') {
-			$retour .= "\n$(self).children('.ajax-loader').remove();";
+		if ($hasLoader==='internal') {
+			$retour.="\n$(self).removeClass('loading');";
+		} elseif ($hasLoader==='internal-x') {
+			$retour.="\n$(self).children('.ajax-loader').remove();";
 		}
-		$retour .= "\t" . $jsCallback . "\n";
+		$retour.="\t".$jsCallback."\n";
 		return $retour;
 	}
 
 	protected function _getResponseElement($responseElement) {
 		if (JString::isNotNull($responseElement)) {
-			$responseElement = Javascript::prep_jquery_selector($responseElement);
+			$responseElement=Javascript::prep_jquery_selector($responseElement);
 		}
 		return $responseElement;
 	}
 
 	protected function _correctAjaxUrl($url) {
-		if ($url !== "/" && JString::endsWith($url, "/") === true)
-			$url = substr($url, 0, strlen($url) - 1);
-		if (strncmp($url, 'http://', 7) != 0 && strncmp($url, 'https://', 8) != 0) {
-			$url = $this->getUrl($url);
+		if ($url!=="/" && JString::endsWith($url, "/")===true)
+			$url=substr($url, 0, strlen($url)-1);
+		if (strncmp($url, 'http://', 7)!=0 && strncmp($url, 'https://', 8)!=0) {
+			$url=$this->getUrl($url);
 		}
 		return $url;
 	}
 
-	public static function _correctParams($params, $ajaxParameters = []) {
+	public static function _correctParams($params, $ajaxParameters=[]) {
 		if (JString::isNull($params)) {
 			return "";
 		}
 		if (\preg_match("@^\{.*?\}$@", $params)) {
-			if (! isset($ajaxParameters['contentType']) || ! JString::contains($ajaxParameters['contentType'], 'json')) {
-				return '$.param(' . $params . ')';
+			if (!isset($ajaxParameters['contentType']) || !JString::contains($ajaxParameters['contentType'], 'json')) {
+				return '$.param('.$params.')';
 			} else {
-				return 'JSON.stringify(' . $params . ')';
+				return 'JSON.stringify('.$params.')';
 			}
 		}
 		return $params;
 	}
 
 	public static function _implodeParams($parameters) {
-		$allParameters = [];
+		$allParameters=[];
 		foreach ($parameters as $params) {
 			if (isset($params))
-				$allParameters[] = self::_correctParams($params);
+				$allParameters[]=self::_correctParams($params);
 		}
 		return \implode("+'&'+", $allParameters);
 	}
 
-	protected function addLoading(&$retour, $responseElement, $ajaxLoader = null) {
-		if (! isset($ajaxLoader)) {
-			$ajaxLoader = $this->ajaxLoader;
+	protected function addLoading(&$retour, $responseElement, $ajaxLoader=null) {
+		if (!isset($ajaxLoader)) {
+			$ajaxLoader=$this->ajaxLoader;
 		}
-		$loading_notifier = '<div class="ajax-loader 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);
 			};
 		}
@@ -240,13 +240,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;
 	}
 
 	/**
@@ -257,7 +257,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);
 	}
 
@@ -271,8 +271,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);
 	}
 
@@ -288,8 +288,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);
 	}
 
@@ -311,7 +311,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);
 	}
 
@@ -327,8 +327,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);
 	}
 
@@ -342,15 +342,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);
 	}
 
@@ -364,7 +364,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);
 	}
 
@@ -380,7 +380,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,
@@ -400,8 +400,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);
 	}
 
@@ -416,29 +416,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);
 	}
 
@@ -453,7 +453,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);
 	}
 
@@ -468,8 +468,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);
 	}
 
@@ -485,7 +485,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,
@@ -506,8 +506,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);
 	}
 
@@ -526,8 +526,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);
 	}
 
@@ -546,7 +546,7 @@ 
 	 * @param array $parameters
 	 *        	default : array("method"=>"get","preventDefault"=>true,"stopPropagation"=>true,"params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","jsCondition"=>NULL,"headers"=>null,"historize"=>false,"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,
@@ -570,7 +570,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);
 	}
 
@@ -587,7 +587,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);
 	}
 
@@ -602,15 +602,15 @@ 
 	 *        	default : array("preventDefault"=>true,"stopPropagation"=>true,"params"=>"{}","jsCallback"=>NULL,"attr"=>"href","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","jsCondition"=>NULL,"headers"=>null,"historize"=>true,"before"=>null)
 	 * @return $this
 	 */
-	public function getHref($element, $responseElement = "", $parameters = array()) {
-		$parameters['attr'] = 'href';
+	public function getHref($element, $responseElement="", $parameters=array()) {
+		$parameters['attr']='href';
 		if (JString::isNull($responseElement)) {
-			$responseElement = '%$(self).attr("data-target")%';
+			$responseElement='%$(self).attr("data-target")%';
 		} else {
-			$responseElement = '%$(self).attr("data-target") || "' . $responseElement . '"%';
+			$responseElement='%$(self).attr("data-target") || "'.$responseElement.'"%';
 		}
-		if (! isset($parameters['historize'])) {
-			$parameters['historize'] = true;
+		if (!isset($parameters['historize'])) {
+			$parameters['historize']=true;
 		}
 		return $this->getOnClick($element, "", $responseElement, $parameters);
 	}
@@ -626,21 +626,21 @@ 
 	 *        	default : array("preventDefault"=>true,"stopPropagation"=>true,"params"=>"{}","jsCallback"=>NULL,"attr"=>"href","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","jsCondition"=>NULL,"headers"=>null,"historize"=>true,"before"=>null)
 	 * @return $this
 	 */
-	public function postHref($element, $responseElement = "", $parameters = array()) {
-		$parameters['attr'] = 'href';
+	public function postHref($element, $responseElement="", $parameters=array()) {
+		$parameters['attr']='href';
 		if (JString::isNull($responseElement)) {
-			$responseElement = '%$(this).attr("data-target")%';
+			$responseElement='%$(this).attr("data-target")%';
 		} else {
-			$responseElement = '%$(self).attr("data-target") || "' . $responseElement . '"%';
+			$responseElement='%$(self).attr("data-target") || "'.$responseElement.'"%';
 		}
-		if (! isset($parameters['historize'])) {
-			$parameters['historize'] = true;
+		if (!isset($parameters['historize'])) {
+			$parameters['historize']=true;
 		}
 		return $this->postOnClick($element, '', '{}', $responseElement, $parameters);
 	}
 
-	private function _post($url, $params = '{}', $responseElement = '', $parameters = []) {
-		$parameters['params'] = $params;
+	private function _post($url, $params='{}', $responseElement='', $parameters=[]) {
+		$parameters['params']=$params;
 		return $this->_ajax('POST', $url, $responseElement, $parameters);
 	}
 
@@ -656,8 +656,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);
 	}
 
@@ -674,8 +674,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);
 	}
 
@@ -694,9 +694,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);
 	}
 
@@ -714,66 +714,66 @@ 
 	 * @param array $parameters
 	 *        	default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null,"historize"=>false,"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);
-		$retour .= "\n$('#" . $form . "').trigger('ajaxSubmit');";
-		if (! isset($contentType) || $contentType != 'false') {
-			$retour .= "\nvar params=$('#" . $form . "').serialize();\n";
+		$async=($async) ? 'true' : 'false';
+		$jsCallback=isset($jsCallback) ? $jsCallback : "";
+		$retour=$this->_getAjaxUrl($url, $attr);
+		$retour.="\n$('#".$form."').trigger('ajaxSubmit');";
+		if (!isset($contentType) || $contentType!='false') {
+			$retour.="\nvar params=$('#".$form."').serialize();\n";
 			if (isset($params)) {
-				$retour .= "params+='&'+" . self::_correctParams($params) . ";\n";
+				$retour.="params+='&'+".self::_correctParams($params).";\n";
 			}
 		} else {
-			$retour .= "\nvar params=new FormData($('#" . $form . "')[0]);\n";
+			$retour.="\nvar params=new FormData($('#".$form."')[0]);\n";
 		}
-		$responseElement = $this->_getResponseElement($responseElement);
-		$retour .= "var self=this;\n";
-		$before = isset($before) ? $before : "";
-		$retour .= $before;
-		if ($hasLoader === true) {
+		$responseElement=$this->_getResponseElement($responseElement);
+		$retour.="var self=this;\n";
+		$before=isset($before) ? $before : "";
+		$retour.=$before;
+		if ($hasLoader===true) {
 			$this->addLoading($retour, $responseElement, $ajaxLoader);
-		} elseif ($hasLoader === 'response') {
+		} elseif ($hasLoader==='response') {
 			$this->addResponseLoading($retour, $responseElement, $ajaxLoader);
-		} elseif ($hasLoader === 'internal') {
-			$retour .= "\n$(this).addClass('loading');";
+		} elseif ($hasLoader==='internal') {
+			$retour.="\n$(this).addClass('loading');";
 		}
-		$ajaxParameters = [
+		$ajaxParameters=[
 			"url" => "url",
 			"method" => "'POST'",
 			"data" => "params",
 			"async" => $async
 		];
 		if (isset($headers)) {
-			$ajaxParameters["headers"] = $headers;
+			$ajaxParameters["headers"]=$headers;
 		}
 		if (isset($partial)) {
-			$ajaxParameters["xhr"] = "xhrProvider";
-			$retour .= "var xhr = $.ajaxSettings.xhr();function xhrProvider() {return xhr;};xhr.onreadystatechange = function (e) { if (3==e.target.readyState){let response=e.target.responseText;" . $partial . ";}; };";
+			$ajaxParameters["xhr"]="xhrProvider";
+			$retour.="var xhr = $.ajaxSettings.xhr();function xhrProvider() {return xhr;};xhr.onreadystatechange = function (e) { if (3==e.target.readyState){let response=e.target.responseText;".$partial.";}; };";
 		}
 		$this->createAjaxParameters($ajaxParameters, $parameters);
-		$retour .= "$.ajax({" . $this->implodeAjaxParameters($ajaxParameters) . "}).done(function( data ) {\n";
-		$retour .= $this->_getOnAjaxDone($responseElement, $jqueryDone, $ajaxTransition, $jsCallback, $hasLoader) . "});\n";
+		$retour.="$.ajax({".$this->implodeAjaxParameters($ajaxParameters)."}).done(function( data ) {\n";
+		$retour.=$this->_getOnAjaxDone($responseElement, $jqueryDone, $ajaxTransition, $jsCallback, $hasLoader)."});\n";
 
 		if ($validation) {
-			$retour = "$('#" . $form . "').validate({submitHandler: function(form) {
-			" . $retour . "
+			$retour="$('#".$form."').validate({submitHandler: function(form) {
+			" . $retour."
 			}});\n";
-			$retour .= "$('#" . $form . "').submit();\n";
+			$retour.="$('#".$form."').submit();\n";
 		}
-		$retour = $this->_addJsCondition($jsCondition, $retour);
+		$retour=$this->_addJsCondition($jsCondition, $retour);
 		if ($immediatly)
-			$this->jquery_code_for_compile[] = $retour;
+			$this->jquery_code_for_compile[]=$retour;
 		return $retour;
 	}
 
@@ -789,8 +789,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);
 	}
 
@@ -807,8 +807,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);
 	}
 
@@ -825,7 +825,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,
@@ -847,11 +847,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) {