phpMv / phpMv-UI

Ajax/ui/properties/Animation.php

Spacing +1 added lines, -1 removed lines

@@ -11,7 +11,7 @@
  */
 class Animation extends BaseComponent {
 
-	public function __construct($duration = 400, $easing = "swing", $queue = false) {
+	public function __construct($duration=400, $easing="swing", $queue=false) {
 		$this->setDuration($duration);
 		$this->setEasing($easing);
 		$this->setQueue($queue);

Ajax/semantic/html/base/HtmlSemDoubleElement.php

Spacing +36 added lines, -36 removed lines

@@ -23,22 +23,22 @@ 
 class HtmlSemDoubleElement extends HtmlDoubleElement {
 	use BaseTrait;
 
-	protected $_popup = NULL;
+	protected $_popup=NULL;
 
-	protected $_dimmer = NULL;
+	protected $_dimmer=NULL;
 
-	protected $_toast = NULL;
+	protected $_toast=NULL;
 
-	protected $_sidebar = NULL;
+	protected $_sidebar=NULL;
 
-	protected $_params = array();
+	protected $_params=array();
 
-	public function __construct($identifier, $tagName = "p", $baseClass = "ui", $content = NULL) {
+	public function __construct($identifier, $tagName="p", $baseClass="ui", $content=NULL) {
 		parent::__construct($identifier, $tagName);
-		$this->_baseClass = $baseClass;
+		$this->_baseClass=$baseClass;
 		$this->setClass($baseClass);
 		if (isset($content)) {
-			$this->content = $content;
+			$this->content=$content;
 		}
 	}
 
@@ -48,7 +48,7 @@ 
 	 * @param string $variation
 	 * @param string $popupEvent
 	 */
-	public function setPopupAttributes($variation = NULL, $popupEvent = NULL) {
+	public function setPopupAttributes($variation=NULL, $popupEvent=NULL) {
 		if (isset($this->_popup))
 			$this->_popup->setAttributes($variation, $popupEvent);
 	}
@@ -62,8 +62,8 @@ 
 	 * @param array $params
 	 * @return HtmlSemDoubleElement
 	 */
-	public function addPopup($title = "", $content = "", $variation = NULL, $params = array()) {
-		$this->_popup = new InternalPopup($this, $title, $content, $variation, $params);
+	public function addPopup($title="", $content="", $variation=NULL, $params=array()) {
+		$this->_popup=new InternalPopup($this, $title, $content, $variation, $params);
 		return $this;
 	}
 
@@ -75,8 +75,8 @@ 
 	 * @param array $params
 	 * @return HtmlSemDoubleElement
 	 */
-	public function addPopupHtml($html = "", $variation = NULL, $params = array()) {
-		$this->_popup = new InternalPopup($this);
+	public function addPopupHtml($html="", $variation=NULL, $params=array()) {
+		$this->_popup=new InternalPopup($this);
 		$this->_popup->setHtml($html);
 		$this->_popup->setAttributes($variation, $params);
 		return $this;
@@ -89,8 +89,8 @@ 
 	 * @param mixed $content
 	 * @return HtmlDimmer
 	 */
-	public function addDimmer($params = array(), $content = NULL) {
-		$dimmer = new HtmlDimmer("dimmer-" . $this->identifier, $content);
+	public function addDimmer($params=array(), $content=NULL) {
+		$dimmer=new HtmlDimmer("dimmer-".$this->identifier, $content);
 		$dimmer->setParams($params);
 		$dimmer->setContainer($this);
 		$this->addContent($dimmer);
@@ -105,10 +105,10 @@ 
 	 * @param string $icon
 	 * @return mixed|HtmlLabel
 	 */
-	public function addLabel($label, $before = false, $icon = NULL) {
-		$labelO = $label;
-		if (\is_object($label) === false) {
-			$labelO = new HtmlLabel("label-" . $this->identifier, $label);
+	public function addLabel($label, $before=false, $icon=NULL) {
+		$labelO=$label;
+		if (\is_object($label)===false) {
+			$labelO=new HtmlLabel("label-".$this->identifier, $label);
 			if (isset($icon))
 				$labelO->addIcon($icon);
 		} else {
@@ -129,8 +129,8 @@ 
 	 * @param string $icon
 	 * @return HtmlSemDoubleElement
 	 */
-	public function attachLabel($label, $side = Side::TOP, $direction = Direction::NONE, $icon = NULL) {
-		$label = $this->addLabel($label, true, $icon);
+	public function attachLabel($label, $side=Side::TOP, $direction=Direction::NONE, $icon=NULL) {
+		$label=$this->addLabel($label, true, $icon);
 		$label->setAttached($side, $direction);
 		return $this;
 	}
@@ -140,7 +140,7 @@ 
 	 *
 	 * @return HtmlSemDoubleElement
 	 */
-	public function asLink($href = NULL, $target = NULL) {
+	public function asLink($href=NULL, $target=NULL) {
 		if (isset($href))
 			$this->setProperty("href", $href);
 		if (isset($target))
@@ -154,11 +154,11 @@ 
 	 * @param boolean $show
 	 * @return string
 	 */
-	public function jsShowDimmer($show = true) {
-		$status = "hide";
-		if ($show === true)
-			$status = "show";
-		return '$("#.' . $this->identifier . ').dimmer("' . $status . '");';
+	public function jsShowDimmer($show=true) {
+		$status="hide";
+		if ($show===true)
+			$status="show";
+		return '$("#.'.$this->identifier.').dimmer("'.$status.'");';
 	}
 
 	/**
@@ -166,7 +166,7 @@ 
 	 * {@inheritdoc}
 	 * @see BaseHtml::compile()
 	 */
-	public function compile(JsUtils $js = NULL, &$view = NULL) {
+	public function compile(JsUtils $js=NULL, &$view=NULL) {
 		if (isset($this->_popup)) {
 			$this->_popup->compile($js);
 		}
@@ -179,7 +179,7 @@ 
 	 * @see HtmlDoubleElement::run()
 	 */
 	public function run(JsUtils $js) {
-		$this->_bsComponent = $js->semantic()->generic("#" . $this->identifier);
+		$this->_bsComponent=$js->semantic()->generic("#".$this->identifier);
 		parent::run($js);
 		$this->addEventsOnRun($js);
 		if (isset($this->_popup)) {
@@ -197,8 +197,8 @@ 
 	 * @param boolean $ordered
 	 * @return \Ajax\common\html\html5\HtmlList
 	 */
-	public function addList($items, $ordered = false) {
-		$list = new HtmlList("list-" . $this->identifier, $items);
+	public function addList($items, $ordered=false) {
+		$list=new HtmlList("list-".$this->identifier, $items);
 		$list->setOrdered($ordered);
 		$list->setClass("ui list");
 		$this->addContent($list);
@@ -210,9 +210,9 @@ 
 	 * @param ?array $params
 	 * @return \Ajax\semantic\components\Toast
 	 */
-	public function asToast($params = NULL) {
-		$this->_toast = new Toast();
-		$this->_toast->attach('#' . $this->_identifier);
+	public function asToast($params=NULL) {
+		$this->_toast=new Toast();
+		$this->_toast->attach('#'.$this->_identifier);
 		$this->setProperty('style', 'display:none;');
 		if (isset($params)) {
 			$this->_toast->setParams($params);
@@ -226,8 +226,8 @@ 
 	 * @param string $classes
 	 * @return \Ajax\semantic\components\Sidebar
 	 */
-	public function asSideBar($classes = '') {
-		$this->_sidebar = new Sidebar();
+	public function asSideBar($classes='') {
+		$this->_sidebar=new Sidebar();
 		$this->addToProperty('class', 'sidebar');
 		return $this->_sidebar;
 	}

Braces +15 added lines, -10 removed lines

@@ -49,8 +49,9 @@ 
 	 * @param string $popupEvent
 	 */
 	public function setPopupAttributes($variation = NULL, $popupEvent = NULL) {
-		if (isset($this->_popup))
-			$this->_popup->setAttributes($variation, $popupEvent);
+		if (isset($this->_popup)) {
+					$this->_popup->setAttributes($variation, $popupEvent);
+		}
 	}
 
 	/**
@@ -109,8 +110,9 @@ 
 		$labelO = $label;
 		if (\is_object($label) === false) {
 			$labelO = new HtmlLabel("label-" . $this->identifier, $label);
-			if (isset($icon))
-				$labelO->addIcon($icon);
+			if (isset($icon)) {
+							$labelO->addIcon($icon);
+			}
 		} else {
 			$labelO->addToPropertyCtrl("class", "label", array(
 				"label"
@@ -141,10 +143,12 @@ 
 	 * @return HtmlSemDoubleElement
 	 */
 	public function asLink($href = NULL, $target = NULL) {
-		if (isset($href))
-			$this->setProperty("href", $href);
-		if (isset($target))
-			$this->setProperty("target", $target);
+		if (isset($href)) {
+					$this->setProperty("href", $href);
+		}
+		if (isset($target)) {
+					$this->setProperty("target", $target);
+		}
 		return $this->setTagName("a");
 	}
 
@@ -156,8 +160,9 @@ 
 	 */
 	public function jsShowDimmer($show = true) {
 		$status = "hide";
-		if ($show === true)
-			$status = "show";
+		if ($show === true) {
+					$status = "show";
+		}
 		return '$("#.' . $this->identifier . ').dimmer("' . $status . '");';
 	}
 

Ajax/semantic/components/Sidebar.php

Spacing +13 added lines, -13 removed lines

@@ -14,9 +14,9 @@ 
  */
 class Sidebar extends SimpleSemExtComponent {
 
-	public function __construct(JsUtils $js = NULL) {
+	public function __construct(JsUtils $js=NULL) {
 		parent::__construct($js);
-		$this->uiName = 'sidebar';
+		$this->uiName='sidebar';
 	}
 
 	public function show() {
@@ -46,32 +46,32 @@ 
 	}
 
 	public function setContext($value) {
-		$this->params['context'] = $value;
+		$this->params['context']=$value;
 		return $this;
 	}
 
-	public function setExclusive($value = true) {
-		$this->params['exclusive'] = true;
+	public function setExclusive($value=true) {
+		$this->params['exclusive']=true;
 		return $this;
 	}
 
-	public function setClosable($value = true) {
-		$this->params['closable'] = $value;
+	public function setClosable($value=true) {
+		$this->params['closable']=$value;
 		return $this;
 	}
 
-	public function setDimPage($value = true) {
-		$this->params['dimPage'] = $value;
+	public function setDimPage($value=true) {
+		$this->params['dimPage']=$value;
 		return $this;
 	}
 
-	public function setScrollLock($value = false) {
-		$this->params['scrollLock'] = $value;
+	public function setScrollLock($value=false) {
+		$this->params['scrollLock']=$value;
 		return $this;
 	}
 
-	public function setReturnScroll($value = false) {
-		$this->params['returnScroll'] = $value;
+	public function setReturnScroll($value=false) {
+		$this->params['returnScroll']=$value;
 		return $this;
 	}
 

Ajax/service/Javascript.php

Spacing +17 added lines, -17 removed lines

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

Ajax/service/AjaxCall.php

Spacing +23 added lines, -23 removed lines

@@ -10,50 +10,50 @@ 
 	private $parameters;
 
 	public function __construct($method, $parameters) {
-		$this->method = $method;
-		$this->parameters = $parameters;
+		$this->method=$method;
+		$this->parameters=$parameters;
 	}
 
-	public function compile(JsUtils $js = null) {
-		if ($js === null)
+	public function compile(JsUtils $js=null) {
+		if ($js===null)
 			return;
-		$params = "{}";
-		$stopPropagation = true;
-		$preventDefault = true;
-		$method = "get";
-		$this->parameters["immediatly"] = false;
+		$params="{}";
+		$stopPropagation=true;
+		$preventDefault=true;
+		$method="get";
+		$this->parameters["immediatly"]=false;
 		extract($this->parameters);
-		$result = $this->_eventPreparing($preventDefault, $stopPropagation);
+		$result=$this->_eventPreparing($preventDefault, $stopPropagation);
 		switch ($this->method) {
 			case "get":
-				$result .= $js->getDeferred($url, $responseElement, $this->parameters);
+				$result.=$js->getDeferred($url, $responseElement, $this->parameters);
 				break;
 			case "post":
-				$result .= $js->postDeferred($url, $params, $responseElement, $this->parameters);
+				$result.=$js->postDeferred($url, $params, $responseElement, $this->parameters);
 				break;
 			case "postForm":
-				$result .= $js->postFormDeferred($url, $form, $responseElement, $this->parameters);
+				$result.=$js->postFormDeferred($url, $form, $responseElement, $this->parameters);
 				break;
 			case "json":
-				$result .= $js->jsonDeferred($url, $method, $this->parameters);
+				$result.=$js->jsonDeferred($url, $method, $this->parameters);
 				break;
 			case "jsonArray":
-				$result .= $js->jsonArrayDeferred($modelSelector, $url, $method, $this->parameters);
+				$result.=$js->jsonArrayDeferred($modelSelector, $url, $method, $this->parameters);
 				break;
 			default:
-				$result .= $js->ajaxDeferred($this->method, $url, $responseElement, $this->parameters);
+				$result.=$js->ajaxDeferred($this->method, $url, $responseElement, $this->parameters);
 				break;
 		}
 		return $result;
 	}
 
 	protected function _eventPreparing($preventDefault, $stopPropagation) {
-		$result = "";
-		if ($preventDefault === true) {
-			$result .= Javascript::$preventDefault;
+		$result="";
+		if ($preventDefault===true) {
+			$result.=Javascript::$preventDefault;
 		}
-		if ($stopPropagation === true) {
-			$result .= Javascript::$stopPropagation;
+		if ($stopPropagation===true) {
+			$result.=Javascript::$stopPropagation;
 		}
 		return $result;
 	}
@@ -63,7 +63,7 @@ 
 	}
 
 	public function setMethod($method) {
-		$this->method = $method;
+		$this->method=$method;
 		return $this;
 	}
 
@@ -72,7 +72,7 @@ 
 	}
 
 	public function setParameters($parameters) {
-		$this->parameters = $parameters;
+		$this->parameters=$parameters;
 		return $this;
 	}
 }

Braces +3 added lines, -2 removed lines

@@ -15,8 +15,9 @@
 	}
 
 	public function compile(JsUtils $js = null) {
-		if ($js === null)
-			return;
+		if ($js === null) {
+					return;
+		}
 		$params = "{}";
 		$stopPropagation = true;
 		$preventDefault = true;

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='ui form' id='frm-" . $this->identifier . "' name='frm-" . $this->identifier . "' " . $noValidate . ">", "</form>");
+			$noValidate="";
+			if (\sizeof($this->_form->getValidationParams())>0)
+				$noValidate="novalidate";
+			$this->wrapContent("<form class='ui form' 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);
 	}
 

Braces +6 added lines, -4 removed lines

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

Ajax/semantic/widgets/datatable/DataTable.php

Spacing +114 added lines, -114 removed lines

@@ -24,7 +24,7 @@ 
  *
  */
 class DataTable extends Widget {
-	use TableTrait,DataTableFieldAsTrait,HasCheckboxesTrait,BaseTrait;
+	use TableTrait, DataTableFieldAsTrait, HasCheckboxesTrait, BaseTrait;
 
 	protected $_searchField;
 
@@ -40,7 +40,7 @@ 
 
 	protected $_displayBehavior;
 
-	protected $_visibleHover = false;
+	protected $_visibleHover=false;
 
 	protected $_targetSelector;
 
@@ -50,7 +50,7 @@ 
 
 	protected $_json;
 
-	protected $_rowClass = "_element";
+	protected $_rowClass="_element";
 
 	protected $_sortable;
 
@@ -58,26 +58,26 @@ 
 
 	protected $_colWidths;
 
-	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
 				]);
@@ -93,16 +93,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);
 		}
 	}
 
@@ -121,21 +121,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);
 			}
@@ -150,14 +150,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);
 	}
@@ -202,21 +202,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);
@@ -224,8 +224,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
@@ -234,20 +234,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;
 		}
 	}
 
@@ -259,9 +259,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];
 			}
@@ -269,31 +269,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);
@@ -306,62 +306,62 @@ 
 
 	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();
 		$footer->addValues($this->_pagination->generateMenu($this->identifier));
 	}
 
-	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:
@@ -388,11 +388,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([
@@ -424,12 +424,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,
@@ -452,8 +452,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;
 	}
 
@@ -468,8 +468,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;
 	}
 
@@ -478,10 +478,10 @@ 
 	 * @param array $compileParts
 	 * @return DataTable
 	 */
-	public function refresh($compileParts = [
+	public function refresh($compileParts=[
 		"tbody"
 	]) {
-		$this->_compileParts = $compileParts;
+		$this->_compileParts=$compileParts;
 		return $this;
 	}
 
@@ -491,14 +491,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;
@@ -526,9 +526,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];
 	}
 
@@ -540,20 +540,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";
 	}
 
 	/**
@@ -562,7 +562,7 @@ 
 	 * @return DataTable
 	 */
 	public function setRefreshSelector($_refreshSelector) {
-		$this->_refreshSelector = $_refreshSelector;
+		$this->_refreshSelector=$_refreshSelector;
 		return $this;
 	}
 
@@ -574,9 +574,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() {
@@ -590,7 +590,7 @@ 
 	 * @return DataTable
 	 */
 	public function setRowClass($_rowClass) {
-		$this->_rowClass = $_rowClass;
+		$this->_rowClass=$_rowClass;
 		return $this;
 	}
 
@@ -601,34 +601,34 @@ 
 	 * @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 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;
 	}
 
@@ -637,7 +637,7 @@ 
 		return $this;
 	}
 
-	public function trigger($event, $params = "[]") {
+	public function trigger($event, $params="[]") {
 		return $this->getHtmlComponent()->trigger($event, $params);
 	}
 
@@ -675,7 +675,7 @@ 
 	 * @param mixed $_displayBehavior
 	 */
 	public function setDisplayBehavior($_displayBehavior) {
-		$this->_displayBehavior = $_displayBehavior;
+		$this->_displayBehavior=$_displayBehavior;
 	}
 
 	/**
@@ -699,6 +699,6 @@ 
 	 * @param boolean $_visibleHover
 	 */
 	public function setVisibleHover($_visibleHover) {
-		$this->_visibleHover = $_visibleHover;
+		$this->_visibleHover=$_visibleHover;
 	}
 }

Braces +36 added lines, -24 removed lines

@@ -82,16 +82,19 @@ 
 					"stopPropagation" => true
 				]);
 			}
-			if (\is_array($this->_deleteBehavior))
-				$this->_generateBehavior("delete", $this->_deleteBehavior, $js);
-			if (\is_array($this->_editBehavior))
-				$this->_generateBehavior("edit", $this->_editBehavior, $js);
+			if (\is_array($this->_deleteBehavior)) {
+							$this->_generateBehavior("delete", $this->_deleteBehavior, $js);
+			}
+			if (\is_array($this->_editBehavior)) {
+							$this->_generateBehavior("edit", $this->_editBehavior, $js);
+			}
 			if (\is_array($this->_displayBehavior)) {
 				$this->_generateBehavior("display", $this->_displayBehavior, $js);
 			}
 			parent::run($js);
-			if (isset($this->_pagination))
-				$this->_associatePaginationBehavior($js, $offset);
+			if (isset($this->_pagination)) {
+							$this->_associatePaginationBehavior($js, $offset);
+			}
 			$this->_associateSearchFieldBehavior($js, $offset);
 			$this->_runned = true;
 		}
@@ -142,8 +145,9 @@ 
 			$table->setRowCount(0, \sizeof($captions));
 			$this->_generateHeader($table, $captions);
 
-			if (isset($this->_compileParts))
-				$table->setCompileParts($this->_compileParts);
+			if (isset($this->_compileParts)) {
+							$table->setCompileParts($this->_compileParts);
+			}
 
 			$this->_generateContent($table);
 
@@ -178,8 +182,9 @@ 
 	}
 
 	protected function _applyStyleAttributes($table) {
-		if (isset($this->_hiddenColumns))
-			$this->_hideColumns();
+		if (isset($this->_hiddenColumns)) {
+					$this->_hideColumns();
+		}
 		if (isset($this->_colWidths)) {
 			foreach ($this->_colWidths as $colIndex => $width) {
 				$table->setColWidth($colIndex, $width);
@@ -288,8 +293,9 @@ 
 			$field = $ck->getField();
 			$field->setProperty("value", $dataAjax);
 			$field->setProperty("name", "selection[]");
-			if (isset($checkedClass))
-				$field->setClass($checkedClass);
+			if (isset($checkedClass)) {
+							$field->setClass($checkedClass);
+			}
 			\array_unshift($values, $ck);
 		}
 		$result = $table->newRow();
@@ -306,8 +312,9 @@ 
 
 	protected function _generatePagination($table) {
 		if (isset($this->_toolbar)) {
-			if ($this->_toolbarPosition == PositionInTable::FOOTER)
-				$this->_toolbar->setFloated("left");
+			if ($this->_toolbarPosition == PositionInTable::FOOTER) {
+							$this->_toolbar->setFloated("left");
+			}
 		}
 		$footer = $table->getFooter();
 		$footer->mergeCol();
@@ -347,8 +354,9 @@ 
 
 	protected function _getFieldName($index) {
 		$fieldName = parent::_getFieldName($index);
-		if (\is_object($fieldName))
-			$fieldName = "field-" . $index;
+		if (\is_object($fieldName)) {
+					$fieldName = "field-" . $index;
+		}
 		return $fieldName . "[]";
 	}
 
@@ -527,8 +535,9 @@ 
 
 	protected function getTargetSelector($op) {
 		$result = $this->_targetSelector;
-		if (! isset($result[$op]))
-			$result = "#" . $this->identifier;
+		if (! isset($result[$op])) {
+					$result = "#" . $this->identifier;
+		}
 		return $result[$op];
 	}
 
@@ -551,8 +560,9 @@ 
 	}
 
 	public function getRefreshSelector() {
-		if (isset($this->_refreshSelector))
-			return $this->_refreshSelector;
+		if (isset($this->_refreshSelector)) {
+					return $this->_refreshSelector;
+		}
 		return "#" . $this->identifier . " tbody";
 	}
 
@@ -573,8 +583,9 @@ 
 	 */
 	public function show($modelInstance) {
 		if (\is_array($modelInstance)) {
-			if (isset($modelInstance[0]) && \is_array(array_values($modelInstance)[0]))
-				$modelInstance = \json_decode(\json_encode($modelInstance), FALSE);
+			if (isset($modelInstance[0]) && \is_array(array_values($modelInstance)[0])) {
+							$modelInstance = \json_decode(\json_encode($modelInstance), FALSE);
+			}
 		}
 		$this->_modelInstance = $modelInstance;
 	}
@@ -616,8 +627,9 @@ 
 	}
 
 	public function hideColumn($colIndex) {
-		if (! \is_array($this->_hiddenColumns))
-			$this->_hiddenColumns = [];
+		if (! \is_array($this->_hiddenColumns)) {
+					$this->_hiddenColumns = [];
+		}
 		$this->_hiddenColumns[] = $colIndex;
 		return $this;
 	}

Ajax/semantic/widgets/base/FieldAsTrait.php

Spacing +96 added lines, -96 removed lines

@@ -36,7 +36,7 @@ 
  */
 trait FieldAsTrait {
 
-	abstract protected function _getFieldIdentifier($prefix, $name = "");
+	abstract protected function _getFieldIdentifier($prefix, $name="");
 
 	abstract public function setValueFunction($index, $callback);
 
@@ -44,16 +44,16 @@ 
 
 	abstract protected function _getFieldCaption($index);
 
-	abstract protected function _buttonAsSubmit(BaseHtml &$button, $event, $url, $responseElement = NULL, $parameters = NULL);
+	abstract protected function _buttonAsSubmit(BaseHtml &$button, $event, $url, $responseElement=NULL, $parameters=NULL);
 
 	/**
 	 *
 	 * @param HtmlFormField $element
 	 * @param array $attributes
 	 */
-	protected function _applyAttributes(BaseHtml $element, &$attributes, $index, $instance = null) {
+	protected function _applyAttributes(BaseHtml $element, &$attributes, $index, $instance=null) {
 		if (isset($attributes["jsCallback"])) {
-			$callback = $attributes["jsCallback"];
+			$callback=$attributes["jsCallback"];
 			if (\is_callable($callback)) {
 				$callback($element, $instance, $index, InstanceViewer::$index);
 			}
@@ -64,15 +64,15 @@ 
 		$element->fromArray($attributes);
 	}
 
-	private function _getLabelField($caption, $icon = NULL) {
-		$label = new HtmlLabel($this->_getFieldIdentifier("lbl"), $caption, $icon);
+	private function _getLabelField($caption, $icon=NULL) {
+		$label=new HtmlLabel($this->_getFieldIdentifier("lbl"), $caption, $icon);
 		return $label;
 	}
 
 	protected function _addRules(HtmlFormField $element, &$attributes) {
 		if (isset($attributes["rules"])) {
-			$this->_hasRules = true;
-			$rules = $attributes["rules"];
+			$this->_hasRules=true;
+			$rules=$attributes["rules"];
 			if (\is_array($rules)) {
 				$element->addRules($rules);
 			} else {
@@ -88,62 +88,62 @@ 
 		return $field;
 	}
 
-	protected function _fieldAs($elementCallback, &$index, $attributes = NULL, $prefix = null) {
-		$this->setValueFunction($index, function ($value, $instance, $index, $rowIndex) use (&$attributes, $elementCallback, $prefix) {
-			$caption = $this->_getFieldCaption($index);
-			$name = $this->_getFieldName($index);
-			$id = $this->_getFieldIdentifier($prefix, $name);
+	protected function _fieldAs($elementCallback, &$index, $attributes=NULL, $prefix=null) {
+		$this->setValueFunction($index, function($value, $instance, $index, $rowIndex) use (&$attributes, $elementCallback, $prefix) {
+			$caption=$this->_getFieldCaption($index);
+			$name=$this->_getFieldName($index);
+			$id=$this->_getFieldIdentifier($prefix, $name);
 			if (isset($attributes["name"])) {
-				$name = $attributes["name"];
+				$name=$attributes["name"];
 				unset($attributes["name"]);
 			}
-			$element = $elementCallback($id, $name, $value, $caption);
+			$element=$elementCallback($id, $name, $value, $caption);
 			if (\is_array($attributes)) {
 				$this->_applyAttributes($element, $attributes, $index, $instance);
 			}
-			$element->setDisabled(! $this->_edition);
+			$element->setDisabled(!$this->_edition);
 			return $element;
 		});
 		return $this;
 	}
 
-	public function fieldAsProgress($index, $label = NULL, $attributes = array()) {
-		$this->setValueFunction($index, function ($value) use ($label, $attributes) {
-			$pb = new HtmlProgress($this->_getFieldIdentifier("pb"), $value, $label, $attributes);
+	public function fieldAsProgress($index, $label=NULL, $attributes=array()) {
+		$this->setValueFunction($index, function($value) use ($label, $attributes) {
+			$pb=new HtmlProgress($this->_getFieldIdentifier("pb"), $value, $label, $attributes);
 			return $pb;
 		});
 		return $this;
 	}
 
-	public function fieldAsRating($index, $max = 5, $icon = "") {
-		$this->setValueFunction($index, function ($value) use ($max, $icon) {
-			$rating = new HtmlRating($this->_getFieldIdentifier("rat"), $value, $max, $icon);
+	public function fieldAsRating($index, $max=5, $icon="") {
+		$this->setValueFunction($index, function($value) use ($max, $icon) {
+			$rating=new HtmlRating($this->_getFieldIdentifier("rat"), $value, $max, $icon);
 			return $rating;
 		});
 		return $this;
 	}
 
-	public function fieldAsLabel($index, $icon = NULL, $attributes = NULL) {
-		return $this->_fieldAs(function ($id, $name, $value) use ($icon) {
-			$lbl = new HtmlLabel($id, $value);
+	public function fieldAsLabel($index, $icon=NULL, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value) use ($icon) {
+			$lbl=new HtmlLabel($id, $value);
 			if (isset($icon))
 				$lbl->addIcon($icon);
 			return $lbl;
 		}, $index, $attributes, "label");
 	}
 
-	public function fieldAsHeader($index, $niveau = 1, $icon = NULL, $attributes = NULL) {
-		return $this->_fieldAs(function ($id, $name, $value) use ($niveau, $icon) {
-			$header = new HtmlHeader($id, $niveau, $value);
+	public function fieldAsHeader($index, $niveau=1, $icon=NULL, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value) use ($niveau, $icon) {
+			$header=new HtmlHeader($id, $niveau, $value);
 			if (isset($icon))
 				$header->asIcon($icon, $value);
 			return $header;
 		}, $index, $attributes, "header");
 	}
 
-	public function fieldAsImage($index, $size = Size::MINI, $circular = false) {
-		$this->setValueFunction($index, function ($img) use ($size, $circular) {
-			$image = new HtmlImage($this->_getFieldIdentifier("image"), $img);
+	public function fieldAsImage($index, $size=Size::MINI, $circular=false) {
+		$this->setValueFunction($index, function($img) use ($size, $circular) {
+			$image=new HtmlImage($this->_getFieldIdentifier("image"), $img);
 			$image->setSize($size);
 			if ($circular)
 				$image->setCircular();
@@ -153,131 +153,131 @@ 
 	}
 
 	public function fieldAsFlag($index) {
-		$this->setValueFunction($index, function ($flag) {
-			$flag = new HtmlFlag($this->_getFieldIdentifier("flag"), $flag);
+		$this->setValueFunction($index, function($flag) {
+			$flag=new HtmlFlag($this->_getFieldIdentifier("flag"), $flag);
 			return $flag;
 		});
 		return $this;
 	}
 
 	public function fieldAsIcon($index) {
-		$this->setValueFunction($index, function ($icon) {
-			$icon = new HtmlIcon($this->_getFieldIdentifier("icon"), $icon);
+		$this->setValueFunction($index, function($icon) {
+			$icon=new HtmlIcon($this->_getFieldIdentifier("icon"), $icon);
 			return $icon;
 		});
 		return $this;
 	}
 
-	public function fieldAsAvatar($index, $attributes = NULL) {
-		return $this->_fieldAs(function ($id, $name, $value) {
-			$img = new HtmlImage($id, $value);
+	public function fieldAsAvatar($index, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value) {
+			$img=new HtmlImage($id, $value);
 			$img->asAvatar();
 			return $img;
 		}, $index, $attributes, "avatar");
 	}
 
-	public function fieldAsRadio($index, $attributes = NULL) {
-		return $this->_fieldAs(function ($id, $name, $value) use ($attributes) {
-			$input = new HtmlFormRadio($id, $name, $value, $value);
+	public function fieldAsRadio($index, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value) use ($attributes) {
+			$input=new HtmlFormRadio($id, $name, $value, $value);
 			return $this->_prepareFormFields($input, $name, $attributes);
 		}, $index, $attributes, "radio");
 	}
 
-	public function fieldAsRadios($index, $elements = [], $attributes = NULL) {
-		return $this->_fieldAs(function ($id, $name, $value, $caption) use ($elements) {
+	public function fieldAsRadios($index, $elements=[], $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) use ($elements) {
 			return HtmlFormFields::radios($name, $elements, $caption, $value);
 		}, $index, $attributes, "radios");
 	}
 
-	public function fieldAsList($index, $classNames = "", $attributes = NULL) {
-		return $this->_fieldAs(function ($id, $name, $value, $caption) use ($classNames) {
-			$result = new HtmlList($name, $value);
+	public function fieldAsList($index, $classNames="", $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) use ($classNames) {
+			$result=new HtmlList($name, $value);
 			$result->addClass($classNames);
 			return $result;
 		}, $index, $attributes, "list");
 	}
 
-	public function fieldAsInput($index, $attributes = NULL) {
-		return $this->_fieldAs(function ($id, $name, $value, $caption) use ($attributes) {
-			$input = new HtmlFormInput($id, $caption, "text", $value);
+	public function fieldAsInput($index, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) use ($attributes) {
+			$input=new HtmlFormInput($id, $caption, "text", $value);
 			return $this->_prepareFormFields($input, $name, $attributes);
 		}, $index, $attributes, "input");
 	}
 
-	public function fieldAsDataList($index, ?array $items = [], $attributes = NULL) {
-		return $this->_fieldAs(function ($id, $name, $value, $caption) use ($attributes, $items) {
-			$input = new HtmlFormInput($id, $caption, "text", $value);
+	public function fieldAsDataList($index, ?array $items=[], $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) use ($attributes, $items) {
+			$input=new HtmlFormInput($id, $caption, "text", $value);
 			$input->getField()
 				->addDataList($items);
 			return $this->_prepareFormFields($input, $name, $attributes);
 		}, $index, $attributes, "input");
 	}
 
-	public function fieldAsFile($index, $attributes = NULL) {
+	public function fieldAsFile($index, $attributes=NULL) {
 		if (isset($this->_form)) {
 			$this->_form->setProperty('enctype', 'multipart/form-data');
 		}
-		return $this->_fieldAs(function ($id, $name, $value, $caption) use ($attributes) {
-			$input = new HtmlFormInput($id, $caption);
+		return $this->_fieldAs(function($id, $name, $value, $caption) use ($attributes) {
+			$input=new HtmlFormInput($id, $caption);
 			$input->asFile();
 			return $this->_prepareFormFields($input, $name, $attributes);
 		}, $index, $attributes, "input");
 	}
 
-	public function fieldAsTextarea($index, $attributes = NULL) {
-		return $this->_fieldAs(function ($id, $name, $value, $caption) use ($attributes) {
-			$textarea = new HtmlFormTextarea($id, $caption, $value);
+	public function fieldAsTextarea($index, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) use ($attributes) {
+			$textarea=new HtmlFormTextarea($id, $caption, $value);
 			return $this->_prepareFormFields($textarea, $name, $attributes);
 		}, $index, $attributes, "textarea");
 	}
 
-	public function fieldAsElement($index, $tagName = "div", $baseClass = "", $attributes = NULL) {
-		return $this->_fieldAs(function ($id, $name, $value, $caption) use ($attributes, $tagName, $baseClass) {
-			$div = new HtmlSemDoubleElement($id, $tagName, $baseClass);
+	public function fieldAsElement($index, $tagName="div", $baseClass="", $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) use ($attributes, $tagName, $baseClass) {
+			$div=new HtmlSemDoubleElement($id, $tagName, $baseClass);
 			$div->setContent(\htmlentities($value));
-			$textarea = new HtmlFormField("field-" . $id, $div, $caption);
+			$textarea=new HtmlFormField("field-".$id, $div, $caption);
 			return $this->_prepareFormFields($textarea, $name, $attributes);
 		}, $index, $attributes, "element");
 	}
 
-	public function fieldAsHidden($index, $attributes = NULL) {
-		if (! \is_array($attributes)) {
-			$attributes = [];
+	public function fieldAsHidden($index, $attributes=NULL) {
+		if (!\is_array($attributes)) {
+			$attributes=[];
 		}
-		$attributes["inputType"] = "hidden";
-		$attributes["style"] = "display:none;";
+		$attributes["inputType"]="hidden";
+		$attributes["style"]="display:none;";
 		return $this->fieldAsInput($index, $attributes);
 	}
 
-	public function fieldAsCheckbox($index, $attributes = NULL) {
-		return $this->_fieldAs(function ($id, $name, $value, $caption) use ($attributes) {
-			if ($caption === null || $caption === "")
-				$caption = "";
-			$input = new HtmlFormCheckbox($id, $caption, $this->_instanceViewer->getIdentifier());
+	public function fieldAsCheckbox($index, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) use ($attributes) {
+			if ($caption===null || $caption==="")
+				$caption="";
+			$input=new HtmlFormCheckbox($id, $caption, $this->_instanceViewer->getIdentifier());
 			$input->setChecked(JString::isBooleanTrue($value));
 			return $this->_prepareFormFields($input, $name, $attributes);
 		}, $index, $attributes, "ck");
 	}
 
-	public function fieldAsDropDown($index, $elements = [], $multiple = false, $attributes = NULL) {
-		return $this->_fieldAs(function ($id, $name, $value, $caption) use ($elements, $multiple, $attributes) {
-			$dd = new HtmlFormDropdown($id, $elements, $caption, $value);
+	public function fieldAsDropDown($index, $elements=[], $multiple=false, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) use ($elements, $multiple, $attributes) {
+			$dd=new HtmlFormDropdown($id, $elements, $caption, $value);
 			$dd->asSelect($name, $multiple);
 			return $this->_prepareFormFields($dd, $name, $attributes);
 		}, $index, $attributes, "dd");
 	}
 
-	public function fieldAsMessage($index, $attributes = NULL) {
-		return $this->_fieldAs(function ($id, $name, $value, $caption) {
-			$mess = new HtmlMessage("message-" . $id, $caption);
+	public function fieldAsMessage($index, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) {
+			$mess=new HtmlMessage("message-".$id, $caption);
 			$mess->addHeader($value);
 			return $mess;
 		}, $index, $attributes, "message");
 	}
 
-	public function fieldAsLink($index, $attributes = NULL) {
-		return $this->_fieldAs(function ($id, $name, $value, $caption) {
-			$lnk = new HtmlLink("message-" . $id, "#", $caption);
+	public function fieldAsLink($index, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) {
+			$lnk=new HtmlLink("message-".$id, "#", $caption);
 			return $lnk;
 		}, $index, $attributes, "link");
 	}
@@ -289,28 +289,28 @@ 
 	 *        	an array or associative array $type=>$attributes
 	 */
 	public function fieldsAs(array $types) {
-		$i = 0;
+		$i=0;
 		if (JArray::isAssociative($types)) {
 			foreach ($types as $type => $attributes) {
 				if (\is_int($type))
-					$this->fieldAs($i ++, $attributes, []);
+					$this->fieldAs($i++, $attributes, []);
 				else {
-					$type = preg_replace('/\d/', '', $type);
-					$this->fieldAs($i ++, $type, $attributes);
+					$type=preg_replace('/\d/', '', $type);
+					$this->fieldAs($i++, $type, $attributes);
 				}
 			}
 		} else {
 			foreach ($types as $type) {
-				$this->fieldAs($i ++, $type);
+				$this->fieldAs($i++, $type);
 			}
 		}
 	}
 
-	public function fieldAs($index, $type, $attributes = NULL) {
-		$method = "fieldAs" . \ucfirst($type);
+	public function fieldAs($index, $type, $attributes=NULL) {
+		$method="fieldAs".\ucfirst($type);
 		if (\method_exists($this, $method)) {
-			if (! \is_array($attributes)) {
-				$attributes = [
+			if (!\is_array($attributes)) {
+				$attributes=[
 					$index
 				];
 			} else {
@@ -323,17 +323,17 @@ 
 		}
 	}
 
-	public function fieldAsSubmit($index, $cssStyle = NULL, $url = NULL, $responseElement = NULL, $attributes = NULL) {
-		return $this->_fieldAs(function ($id, $name, $value, $caption) use ($url, $responseElement, $cssStyle, $attributes) {
-			$button = new HtmlButton($id, $caption, $cssStyle);
+	public function fieldAsSubmit($index, $cssStyle=NULL, $url=NULL, $responseElement=NULL, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) use ($url, $responseElement, $cssStyle, $attributes) {
+			$button=new HtmlButton($id, $caption, $cssStyle);
 			$this->_buttonAsSubmit($button, "click", $url, $responseElement, @$attributes["ajax"]);
 			return $button;
 		}, $index, $attributes, "submit");
 	}
 
-	public function fieldAsButton($index, $cssStyle = NULL, $attributes = NULL) {
-		return $this->_fieldAs(function ($id, $name, $value, $caption) use ($cssStyle) {
-			$button = new HtmlButton($id, $value, $cssStyle);
+	public function fieldAsButton($index, $cssStyle=NULL, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) use ($cssStyle) {
+			$button=new HtmlButton($id, $value, $cssStyle);
 			return $button;
 		}, $index, $attributes, "button");
 	}

Braces +15 added lines, -11 removed lines

@@ -126,8 +126,9 @@ 
 	public function fieldAsLabel($index, $icon = NULL, $attributes = NULL) {
 		return $this->_fieldAs(function ($id, $name, $value) use ($icon) {
 			$lbl = new HtmlLabel($id, $value);
-			if (isset($icon))
-				$lbl->addIcon($icon);
+			if (isset($icon)) {
+							$lbl->addIcon($icon);
+			}
 			return $lbl;
 		}, $index, $attributes, "label");
 	}
@@ -135,8 +136,9 @@ 
 	public function fieldAsHeader($index, $niveau = 1, $icon = NULL, $attributes = NULL) {
 		return $this->_fieldAs(function ($id, $name, $value) use ($niveau, $icon) {
 			$header = new HtmlHeader($id, $niveau, $value);
-			if (isset($icon))
-				$header->asIcon($icon, $value);
+			if (isset($icon)) {
+							$header->asIcon($icon, $value);
+			}
 			return $header;
 		}, $index, $attributes, "header");
 	}
@@ -145,8 +147,9 @@ 
 		$this->setValueFunction($index, function ($img) use ($size, $circular) {
 			$image = new HtmlImage($this->_getFieldIdentifier("image"), $img);
 			$image->setSize($size);
-			if ($circular)
-				$image->setCircular();
+			if ($circular) {
+							$image->setCircular();
+			}
 			return $image;
 		});
 		return $this;
@@ -251,8 +254,9 @@ 
 
 	public function fieldAsCheckbox($index, $attributes = NULL) {
 		return $this->_fieldAs(function ($id, $name, $value, $caption) use ($attributes) {
-			if ($caption === null || $caption === "")
-				$caption = "";
+			if ($caption === null || $caption === "") {
+							$caption = "";
+			}
 			$input = new HtmlFormCheckbox($id, $caption, $this->_instanceViewer->getIdentifier());
 			$input->setChecked(JString::isBooleanTrue($value));
 			return $this->_prepareFormFields($input, $name, $attributes);
@@ -292,9 +296,9 @@ 
 		$i = 0;
 		if (JArray::isAssociative($types)) {
 			foreach ($types as $type => $attributes) {
-				if (\is_int($type))
-					$this->fieldAs($i ++, $attributes, []);
-				else {
+				if (\is_int($type)) {
+									$this->fieldAs($i ++, $attributes, []);
+				} else {
 					$type = preg_replace('/\d/', '', $type);
 					$this->fieldAs($i ++, $type, $attributes);
 				}

Ajax/common/traits/JsUtilsAjaxTrait.php

Braces +23 added lines, -16 removed lines

@@ -60,8 +60,9 @@ 
 		$retour .= $this->_getOnAjaxDone ( $responseElement, $jqueryDone, $ajaxTransition, $jsCallback, $hasLoader, ($historize ? $originalSelector : null) ) . "});\n";
 
 		$retour = $this->_addJsCondition ( $jsCondition, $retour );
-		if ($immediatly)
-			$this->jquery_code_for_compile [] = $retour;
+		if ($immediatly) {
+					$this->jquery_code_for_compile [] = $retour;
+		}
 		return $retour;
 	}
 	protected function createAjaxParameters(&$original, $parameters) {
@@ -112,8 +113,9 @@ 
 				$retour .= "url=url+'" . $slash . "'+$(this).html();\n";
 			} elseif (\substr ( $attr, 0, 3 ) === "js:") {
 				$retour .= "url=url+'" . $slash . "'+" . \substr ( $attr, 3 ) . ";\n";
-			} elseif ($attr !== null && $attr !== "")
-				$retour .= "url=url+'" . $slash . "'+($(this).attr('" . $attr . "')||'');\n";
+			} elseif ($attr !== null && $attr !== "") {
+							$retour .= "url=url+'" . $slash . "'+($(this).attr('" . $attr . "')||'');\n";
+			}
 		}
 		return $retour;
 	}
@@ -134,10 +136,11 @@ 
 			} elseif (isset ( $this->ajaxTransition )) {
 				$call = $this->ajaxTransition;
 			}
-			if (\is_callable ( $call ))
-				$retour = "\t" . $call ( $responseElement, $jqueryDone ) . ";\n";
-			else
-				$retour = "\t{$responseElement}.{$jqueryDone}( data );\n";
+			if (\is_callable ( $call )) {
+							$retour = "\t" . $call ( $responseElement, $jqueryDone ) . ";\n";
+			} else {
+							$retour = "\t{$responseElement}.{$jqueryDone}( data );\n";
+			}
 		}
 		if (isset ( $history )) {
 			if ($this->params ["autoActiveLinks"]) {
@@ -158,8 +161,9 @@ 
 		return $responseElement;
 	}
 	protected function _correctAjaxUrl($url) {
-		if ($url !== "/" && JString::endsWith ( $url, "/" ) === true)
-			$url = substr ( $url, 0, strlen ( $url ) - 1 );
+		if ($url !== "/" && JString::endsWith ( $url, "/" ) === true) {
+					$url = substr ( $url, 0, strlen ( $url ) - 1 );
+		}
 		if (strncmp ( $url, 'http://', 7 ) != 0 && strncmp ( $url, 'https://', 8 ) != 0) {
 			$url = $this->getUrl ( $url );
 		}
@@ -181,8 +185,9 @@ 
 	public static function _implodeParams($parameters) {
 		$allParameters = [ ];
 		foreach ( $parameters as $params ) {
-			if (isset ( $params ))
-				$allParameters [] = self::_correctParams ( $params );
+			if (isset ( $params )) {
+							$allParameters [] = self::_correctParams ( $params );
+			}
 		}
 		return \implode ( "+'&'+", $allParameters );
 	}
@@ -212,8 +217,9 @@ 
 	}
 	protected function setDefaultParameters(&$parameters, $default) {
 		foreach ( $default as $k => $v ) {
-			if (! isset ( $parameters [$k] ))
-				$parameters [$k] = $v;
+			if (! isset ( $parameters [$k] )) {
+							$parameters [$k] = $v;
+			}
 		}
 	}
 	public function setAjaxLoader($loader) {
@@ -745,8 +751,9 @@ 
 			$retour .= "$('#" . $form . "').submit();\n";
 		}
 		$retour = $this->_addJsCondition ( $jsCondition, $retour );
-		if ($immediatly)
-			$this->jquery_code_for_compile [] = $retour;
+		if ($immediatly) {
+					$this->jquery_code_for_compile [] = $retour;
+		}
 		return $retour;
 	}
 

Spacing +281 added lines, -281 removed lines

@@ -14,211 +14,211 @@ 
  */
 trait JsUtilsAjaxTrait {
 	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 interval($jsCode, $time, $globalName = null, $immediatly = true);
-
-	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 )) {
-			$this->addLoading ( $retour, $responseElement, $ajaxLoader );
-		} elseif ($hasLoader === 'response') {
-			$this->addResponseLoading ( $retour, $responseElement, $ajaxLoader );
-		} elseif ($hasLoader === 'internal') {
-			$retour .= "\n$(this).addClass('loading');";
-		}
-		$ajaxParameters = [ 
+	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);
+
+	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)) {
+			$this->addLoading($retour, $responseElement, $ajaxLoader);
+		} elseif ($hasLoader==='response') {
+			$this->addResponseLoading($retour, $responseElement, $ajaxLoader);
+		} elseif ($hasLoader==='internal') {
+			$retour.="\n$(this).addClass('loading');";
+		}
+		$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 );
+		if (isset ($params)) {
+			$ajaxParameters ["data"]=self::_correctParams($params, $parameters);
 		}
-		if (isset ( $headers )) {
-			$ajaxParameters ["headers"] = $headers;
+		if (isset ($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 . ";}; };";
+		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.";}; };";
 		}
-		$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";
+		$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 = $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%}",
 				"complete" => "function(jqXHR){%value%}",
 				"processData" => "%value%"
 		];
-		foreach ( $validParameters as $param => $mask ) {
-			if (isset ( $parameters [$param] )) {
-				$original [$param] = \str_replace ( "%value%", $parameters [$param], $mask );
+		foreach ($validParameters as $param => $mask) {
+			if (isset ($parameters [$param])) {
+				$original [$param]=\str_replace("%value%", $parameters [$param], $mask);
 			}
 		}
 	}
 	protected function implodeAjaxParameters($ajaxParameters) {
-		$s = '';
-		foreach ( $ajaxParameters as $k => $v ) {
-			if ($s !== '') {
-				$s .= ',';
+		$s='';
+		foreach ($ajaxParameters as $k => $v) {
+			if ($s!=='') {
+				$s.=',';
 			}
-			if (is_array ( $v )) {
-				$s .= "'{$k}':{" . self::implodeAjaxParameters ( $v ) . "}";
+			if (is_array($v)) {
+				$s.="'{$k}':{".self::implodeAjaxParameters($v)."}";
 			} else {
-				$s .= "'{$k}':{$v}";
+				$s.="'{$k}':{$v}";
 			}
 		}
 		return $s;
 	}
 	protected function _addJsCondition($jsCondition, $jsSource) {
-		if (isset ( $jsCondition )) {
-			return "if(" . $jsCondition . "){\n" . $jsSource . "\n}";
+		if (isset ($jsCondition)) {
+			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 = "";
-		}
-		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";
+		$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";
 		}
 		return $retour;
 	}
 	protected function onPopstate() {
 		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;
-		if (JString::isNotNull ( $responseElement )) {
-			if (isset ( $ajaxTransition )) {
-				$call = $this->setAjaxDataCall ( $ajaxTransition );
-			} elseif (isset ( $this->ajaxTransition )) {
-				$call = $this->ajaxTransition;
+	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);
+			} elseif (isset ($this->ajaxTransition)) {
+				$call=$this->ajaxTransition;
 			}
-			if (\is_callable ( $call ))
-				$retour = "\t" . $call ( $responseElement, $jqueryDone ) . ";\n";
+			if (\is_callable($call))
+				$retour="\t".$call($responseElement, $jqueryDone).";\n";
 			else
-				$retour = "\t{$responseElement}.{$jqueryDone}( data );\n";
+				$retour="\t{$responseElement}.{$jqueryDone}( data );\n";
 		}
-		if (isset ( $history )) {
+		if (isset ($history)) {
 			if ($this->params ["autoActiveLinks"]) {
-				$retour .= $this->autoActiveLinks ( "url" );
+				$retour.=$this->autoActiveLinks("url");
 			}
-			$retour .= "\nwindow.history.pushState({'html':data,'selector':" . Javascript::prep_value ( $history ) . ",'jqueryDone':'{$jqueryDone}'},'', url);";
+			$retour.="\nwindow.history.pushState({'html':data,'selector':".Javascript::prep_value($history).",'jqueryDone':'{$jqueryDone}'},'', url);";
 		}
-		if ($hasLoader === 'internal') {
-			$retour .= "\n$(self).removeClass('loading');";
+		if ($hasLoader==='internal') {
+			$retour.="\n$(self).removeClass('loading');";
 		}
-		$retour .= "\t" . $jsCallback . "\n";
+		$retour.="\t".$jsCallback."\n";
 		return $retour;
 	}
 	protected function _getResponseElement($responseElement) {
-		if (JString::isNotNull ( $responseElement )) {
-			$responseElement = Javascript::prep_jquery_selector ( $responseElement );
+		if (JString::isNotNull($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 = [ ]) {
-		if (JString::isNull ( $params )) {
+	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 (\preg_match("@^\{.*?\}$@", $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 = [ ];
-		foreach ( $parameters as $params ) {
-			if (isset ( $params ))
-				$allParameters [] = self::_correctParams ( $params );
+		$allParameters=[];
+		foreach ($parameters as $params) {
+			if (isset ($params))
+				$allParameters []=self::_correctParams($params);
 		}
-		return \implode ( "+'&'+", $allParameters );
+		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) {
-				return AjaxTransition::{$params} ( $responseElement, $jqueryDone );
+		$result=null;
+		if (!\is_callable($params)) {
+			$result=function($responseElement, $jqueryDone='html') use ($params) {
+				return AjaxTransition::{$params} ($responseElement, $jqueryDone);
 			};
 		}
 		return $result;
 	}
 	protected function setDefaultParameters(&$parameters, $default) {
-		foreach ( $default as $k => $v ) {
-			if (! isset ( $parameters [$k] ))
-				$parameters [$k] = $v;
+		foreach ($default as $k => $v) {
+			if (!isset ($parameters [$k]))
+				$parameters [$k]=$v;
 		}
 	}
 	public function setAjaxLoader($loader) {
-		$this->ajaxLoader = $loader;
+		$this->ajaxLoader=$loader;
 	}
 
 	/**
@@ -229,8 +229,8 @@ 
 	 * @param string $responseElement
 	 *        	selector of the HTML element displaying the answer
 	 */
-	private function _get($url, $responseElement = '', $parameters = [ ]) {
-		return $this->_ajax ( 'get', $url, $responseElement, $parameters );
+	private function _get($url, $responseElement='', $parameters=[]) {
+		return $this->_ajax('get', $url, $responseElement, $parameters);
 	}
 
 	/**
@@ -243,9 +243,9 @@ 
 	 * @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;
-		return $this->_get ( $url, $responseElement, $parameters );
+	public function get($url, $responseElement='', $parameters=[]) {
+		$parameters ['immediatly']=true;
+		return $this->_get($url, $responseElement, $parameters);
 	}
 
 	/**
@@ -260,9 +260,9 @@ 
 	 * @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;
-		return $this->_ajax ( $method, $url, $responseElement, $parameters );
+	public function ajax($method, $url, $responseElement='', $parameters=[]) {
+		$parameters ['immediatly']=true;
+		return $this->_ajax($method, $url, $responseElement, $parameters);
 	}
 
 	/**
@@ -283,8 +283,8 @@ 
 	 *        	$immediatly
 	 * @return string
 	 */
-	public function ajaxInterval($method, $url, $interval, $globalName = null, $responseElement = '', $parameters = [ ], $immediatly = true) {
-		return $this->interval ( $this->ajaxDeferred ( $method, $url, $responseElement, $parameters ), $interval, $globalName, $immediatly );
+	public function ajaxInterval($method, $url, $interval, $globalName=null, $responseElement='', $parameters=[], $immediatly=true) {
+		return $this->interval($this->ajaxDeferred($method, $url, $responseElement, $parameters), $interval, $globalName, $immediatly);
 	}
 
 	/**
@@ -299,9 +299,9 @@ 
 	 * @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;
-		return $this->_ajax ( $method, $url, $responseElement, $parameters );
+	public function ajaxDeferred($method, $url, $responseElement='', $parameters=[]) {
+		$parameters ['immediatly']=false;
+		return $this->_ajax($method, $url, $responseElement, $parameters);
 	}
 
 	/**
@@ -314,16 +314,16 @@ 
 	 * @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;
-		return $this->_ajax ( $method, $url, null, $parameters );
+		]);
+		$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);
 	}
 
 	/**
@@ -336,8 +336,8 @@ 
 	 * @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 = [ ]) {
-		return $this->_json ( $url, $method, $parameters );
+	public function json($url, $method="get", $parameters=[]) {
+		return $this->_json($url, $method, $parameters);
 	}
 
 	/**
@@ -352,14 +352,14 @@ 
 	 * @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 ()) {
-		$this->setDefaultParameters ( $parameters, [ 
+	public function jsonOn($event, $element, $url, $method='get', $parameters=array()) {
+		$this->setDefaultParameters($parameters, [ 
 				'preventDefault' => true,
 				'stopPropagation' => true,
 				'immediatly' => true,
 				'listenerOn'=>false
-		] );
-		return $this->_add_event ( $element, $this->jsonDeferred ( $url, $method, $parameters ), $event, $parameters ["preventDefault"], $parameters ["stopPropagation"], $parameters ["immediatly"] ,$parameters['listenerOn']);
+		]);
+		return $this->_add_event($element, $this->jsonDeferred($url, $method, $parameters), $event, $parameters ["preventDefault"], $parameters ["stopPropagation"], $parameters ["immediatly"], $parameters['listenerOn']);
 	}
 
 	/**
@@ -372,9 +372,9 @@ 
 	 * @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;
-		return $this->_json ( $url, $method, $parameters );
+	public function jsonDeferred($url, $method='get', $parameters=[]) {
+		$parameters ['immediatly']=false;
+		return $this->_json($url, $method, $parameters);
 	}
 
 	/**
@@ -388,30 +388,30 @@ 
 	 * @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;
-		return $this->_ajax ( $method, $url, null, $parameters );
+		$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);
 	}
 
 	/**
@@ -425,8 +425,8 @@ 
 	 * @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 = [ ]) {
-		return $this->_jsonArray ( $maskSelector, $url, $method, $parameters );
+	public function jsonArray($maskSelector, $url, $method='get', $parameters=[]) {
+		return $this->_jsonArray($maskSelector, $url, $method, $parameters);
 	}
 
 	/**
@@ -440,9 +440,9 @@ 
 	 * @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;
-		return $this->jsonArray ( $maskSelector, $url, $method, $parameters );
+	public function jsonArrayDeferred($maskSelector, $url, $method='get', $parameters=[]) {
+		$parameters ['immediatly']=false;
+		return $this->jsonArray($maskSelector, $url, $method, $parameters);
 	}
 
 	/**
@@ -457,14 +457,14 @@ 
 	 * @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 ()) {
-		$this->setDefaultParameters ( $parameters, [ 
+	public function jsonArrayOn($event, $element, $maskSelector, $url, $method='get', $parameters=array()) {
+		$this->setDefaultParameters($parameters, [ 
 				'preventDefault' => true,
 				'stopPropagation' => true,
 				'immediatly' => true,
 				'listenerOn'=>false
-		] );
-		return $this->_add_event ( $element, $this->jsonArrayDeferred ( $maskSelector, $url, $method, $parameters ), $event, $parameters ["preventDefault"], $parameters ["stopPropagation"], $parameters ["immediatly"] ,$parameters['listenerOn']);
+		]);
+		return $this->_add_event($element, $this->jsonArrayDeferred($maskSelector, $url, $method, $parameters), $event, $parameters ["preventDefault"], $parameters ["stopPropagation"], $parameters ["immediatly"], $parameters['listenerOn']);
 	}
 
 	/**
@@ -478,9 +478,9 @@ 
 	 * @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;
-		return $this->_get ( $url, $responseElement, $parameters );
+	public function getDeferred($url, $responseElement="", $parameters=[]) {
+		$parameters ['immediatly']=false;
+		return $this->_get($url, $responseElement, $parameters);
 	}
 
 	/**
@@ -498,9 +498,9 @@ 
 	 * @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 ()) {
+	public function getOn($event, $element, $url, $responseElement="", $parameters=array()) {
 		$parameters['method']='get';
-		return $this->ajaxOn($event, $element, $url,$responseElement,$parameters);
+		return $this->ajaxOn($event, $element, $url, $responseElement, $parameters);
 	}
 
 	/**
@@ -518,15 +518,15 @@ 
 	 * @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 ()) {
-		$this->setDefaultParameters ( $parameters, [ 
+	public function ajaxOn($event, $element, $url, $responseElement='', $parameters=array()) {
+		$this->setDefaultParameters($parameters, [ 
 				'preventDefault' => true,
 				'stopPropagation' => true,
 				'immediatly' => true,
 				'method' => 'get',
 				'listenerOn'=>false
-		] );
-		return $this->_add_event ( $element, $this->ajaxDeferred ( $parameters ['method'], $url, $responseElement, $parameters ), $event, $parameters ["preventDefault"], $parameters ["stopPropagation"], $parameters ["immediatly"],$parameters['listenerOn'] );
+		]);
+		return $this->_add_event($element, $this->ajaxDeferred($parameters ['method'], $url, $responseElement, $parameters), $event, $parameters ["preventDefault"], $parameters ["stopPropagation"], $parameters ["immediatly"], $parameters['listenerOn']);
 	}
 
 	/**
@@ -542,8 +542,8 @@ 
 	 * @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 ()) {
-		return $this->ajaxOn ( 'click', $element, $url, $responseElement, $parameters );
+	public function ajaxOnClick($element, $url, $responseElement='', $parameters=array()) {
+		return $this->ajaxOn('click', $element, $url, $responseElement, $parameters);
 	}
 
 	/**
@@ -559,8 +559,8 @@ 
 	 * @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 ()) {
-		return $this->getOn ( 'click', $element, $url, $responseElement, $parameters );
+	public function getOnClick($element, $url, $responseElement='', $parameters=array()) {
+		return $this->getOn('click', $element, $url, $responseElement, $parameters);
 	}
 
 	/**
@@ -574,17 +574,17 @@ 
 	 *        	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';
-		if (JString::isNull ( $responseElement )) {
-			$responseElement = '%$(self).attr("data-target")%';
+	public function getHref($element, $responseElement="", $parameters=array()) {
+		$parameters ['attr']='href';
+		if (JString::isNull($responseElement)) {
+			$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 );
+		return $this->getOnClick($element, "", $responseElement, $parameters);
 	}
 
 	/**
@@ -598,21 +598,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';
-		if (JString::isNull ( $responseElement )) {
-			$responseElement = '%$(this).attr("data-target")%';
+	public function postHref($element, $responseElement="", $parameters=array()) {
+		$parameters ['attr']='href';
+		if (JString::isNull($responseElement)) {
+			$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 );
+		return $this->postOnClick($element, '', '{}', $responseElement, $parameters);
 	}
-	private function _post($url, $params = '{}', $responseElement = '', $parameters = [ ]) {
-		$parameters ['params'] = $params;
-		return $this->_ajax ( 'POST', $url, $responseElement, $parameters );
+	private function _post($url, $params='{}', $responseElement='', $parameters=[]) {
+		$parameters ['params']=$params;
+		return $this->_ajax('POST', $url, $responseElement, $parameters);
 	}
 
 	/**
@@ -627,9 +627,9 @@ 
 	 * @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;
-		return $this->_post ( $url, $params, $responseElement, $parameters );
+	public function post($url, $params="{}", $responseElement="", $parameters=[]) {
+		$parameters ['immediatly']=true;
+		return $this->_post($url, $params, $responseElement, $parameters);
 	}
 
 	/**
@@ -645,9 +645,9 @@ 
 	 * @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;
-		return $this->_post ( $url, $params, $responseElement, $parameters );
+	public function postDeferred($url, $params="{}", $responseElement="", $parameters=[]) {
+		$parameters ['immediatly']=false;
+		return $this->_post($url, $params, $responseElement, $parameters);
 	}
 
 	/**
@@ -665,10 +665,10 @@ 
 	 * @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 ()) {
+	public function postOn($event, $element, $url, $params="{}", $responseElement="", $parameters=array()) {
 		$parameters['method']='post';
-		$parameters ['params'] = $params;
-		return $this->ajaxOn($event, $element, $url,$responseElement,$parameters);
+		$parameters ['params']=$params;
+		return $this->ajaxOn($event, $element, $url, $responseElement, $parameters);
 	}
 
 	/**
@@ -685,65 +685,65 @@ 
 	 * @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 ()) {
-		return $this->postOn ( 'click', $element, $url, $params, $responseElement, $parameters );
-	}
-	private function _postForm($url, $form, $responseElement, $parameters = [ ]) {
-		if (isset ( $this->params ['ajax'] )) {
-			extract ( $this->params ['ajax'] );
-		}
-		$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";
-			if (isset ( $params )) {
-				$retour .= "params+='&'+" . self::_correctParams ( $params ) . ";\n";
+	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=[]) {
+		if (isset ($this->params ['ajax'])) {
+			extract($this->params ['ajax']);
+		}
+		$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";
+			if (isset ($params)) {
+				$retour.="params+='&'+".self::_correctParams($params).";\n";
 			}
 		} else {
-			$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) {
-			$this->addLoading ( $retour, $responseElement, $ajaxLoader );
-		} elseif ($hasLoader === 'response') {
-			$this->addResponseLoading ( $retour, $responseElement, $ajaxLoader );
-		} elseif ($hasLoader === 'internal') {
-			$retour .= "\n$(this).addClass('loading');";
-		}
-		$ajaxParameters = [ 
+			$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) {
+			$this->addLoading($retour, $responseElement, $ajaxLoader);
+		} elseif ($hasLoader==='response') {
+			$this->addResponseLoading($retour, $responseElement, $ajaxLoader);
+		} elseif ($hasLoader==='internal') {
+			$retour.="\n$(this).addClass('loading');";
+		}
+		$ajaxParameters=[ 
 				"url" => "url",
 				"method" => "'POST'",
 				"data" => "params",
 				"async" => $async
 		];
-		if (isset ( $headers )) {
-			$ajaxParameters ["headers"] = $headers;
+		if (isset ($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 . ";}; };";
+		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.";}; };";
 		}
-		$this->createAjaxParameters ( $ajaxParameters, $parameters );
-		$retour .= "$.ajax({" . $this->implodeAjaxParameters ( $ajaxParameters ) . "}).done(function( data ) {\n";
-		$retour .= $this->_getOnAjaxDone ( $responseElement, $jqueryDone, $ajaxTransition, $jsCallback, $hasLoader ) . "});\n";
+		$this->createAjaxParameters($ajaxParameters, $parameters);
+		$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;
 	}
 
@@ -759,9 +759,9 @@ 
 	 * @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;
-		return $this->_postForm ( $url, $form, $responseElement, $parameters );
+	public function postForm($url, $form, $responseElement, $parameters=[]) {
+		$parameters ['immediatly']=true;
+		return $this->_postForm($url, $form, $responseElement, $parameters);
 	}
 
 	/**
@@ -777,9 +777,9 @@ 
 	 * @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;
-		return $this->_postForm ( $url, $form, $responseElement, $parameters );
+	public function postFormDeferred($url, $form, $responseElement, $parameters=[]) {
+		$parameters ['immediatly']=false;
+		return $this->_postForm($url, $form, $responseElement, $parameters);
 	}
 
 	/**
@@ -795,14 +795,14 @@ 
 	 * @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 ()) {
-		$this->setDefaultParameters ( $parameters, [ 
+	public function postFormOn($event, $element, $url, $form, $responseElement="", $parameters=array()) {
+		$this->setDefaultParameters($parameters, [ 
 				'preventDefault' => true,
 				'stopPropagation' => true,
 				'immediatly' => true,
 				'listenerOn'=>false
-		] );
-		return $this->_add_event ( $element, $this->postFormDeferred ( $url, $form, $responseElement, $parameters ), $event, $parameters ["preventDefault"], $parameters ["stopPropagation"], $parameters ["immediatly"] ,$parameters['listenerOn']);
+		]);
+		return $this->_add_event($element, $this->postFormDeferred($url, $form, $responseElement, $parameters), $event, $parameters ["preventDefault"], $parameters ["stopPropagation"], $parameters ["immediatly"], $parameters['listenerOn']);
 	}
 
 	/**
@@ -817,7 +817,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 postFormOnClick($element, $url, $form, $responseElement = "", $parameters = array ()) {
-		return $this->postFormOn ( "click", $element, $url, $form, $responseElement, $parameters );
+	public function postFormOnClick($element, $url, $form, $responseElement="", $parameters=array()) {
+		return $this->postFormOn("click", $element, $url, $form, $responseElement, $parameters);
 	}
 }