phpMv / phpMv-UI

Ajax/ui/components/Buttonset.php

Spacing +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
 
 	public function __construct(JsUtils $js) {
 		parent::__construct($js);
-		$this->uiName = "buttonset";
+		$this->uiName="buttonset";
 	}
 
 	/**

Ajax/ui/properties/Position.php

Spacing +3 added lines, -3 removed lines

@@ -11,7 +11,7 @@ 
  */
 class Position extends BaseComponent {
 
-	public function __construct($my = "left top", $at = "left bottom", $collision = "none", $within = "window") {
+	public function __construct($my="left top", $at="left bottom", $collision="none", $within="window") {
 		$this->setParam("my", $my);
 		$this->setParam("at", $at);
 		$this->setParam("collision", $collision);
@@ -82,8 +82,8 @@ 
 	}
 
 	protected function setParamCtrl($key, $value, $typeCtrl) {
-		if (! $typeCtrl($value)) {
-			throw new \Exception("La fonction " . $typeCtrl . " a retourné faux pour l'affectation de la propriété " . $key . " à la position");
+		if (!$typeCtrl($value)) {
+			throw new \Exception("La fonction ".$typeCtrl." a retourné faux pour l'affectation de la propriété ".$key." à la position");
 		} else
 			$this->setParam($key, $value);
 	}

Braces +3 added lines, -2 removed lines

@@ -84,8 +84,9 @@
 	protected function setParamCtrl($key, $value, $typeCtrl) {
 		if (! $typeCtrl($value)) {
 			throw new \Exception("La fonction " . $typeCtrl . " a retourné faux pour l'affectation de la propriété " . $key . " à la position");
-		} else
-			$this->setParam($key, $value);
+		} else {
+					$this->setParam($key, $value);
+		}
 	}
 
 	/*

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/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/semantic/widgets/base/FieldAsTrait.php

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);
 				}

Spacing +116 added lines, -116 removed lines

@@ -37,7 +37,7 @@ 
  */
 trait FieldAsTrait {
 
-	abstract protected function _getFieldIdentifier($prefix, $name = "");
+	abstract protected function _getFieldIdentifier($prefix, $name="");
 
 	abstract public function setValueFunction($index, $callback);
 
@@ -45,7 +45,7 @@ 
 
 	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);
 
 	private $_speProperties;
 
@@ -54,9 +54,9 @@ 
 	 * @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);
 			}
@@ -67,15 +67,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 {
@@ -85,30 +85,30 @@ 
 		}
 	}
 
-	protected function _prepareFormFields(HtmlFormField &$field, $name, &$attributes) {
+	protected function _prepareFormFields(HtmlFormField&$field, $name, &$attributes) {
 		$field->setName($name);
 		$this->_addRules($field, $attributes);
 		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 (isset($this->_speProperties[$index])) {
-				$attributes ??= [];
-				$attributes += $this->_speProperties[$index];
+				$attributes??=[];
+				$attributes+=$this->_speProperties[$index];
 			}
 			if (\is_array($attributes)) {
 				$this->_applyAttributes($element, $attributes, $index, $instance);
 			}
-			$element->setDisabled(! $this->_edition);
+			$element->setDisabled(!$this->_edition);
 			return $element;
 		});
 		return $this;
@@ -124,48 +124,48 @@ 
 	 */
 	public function setPropertyValues($property, $indexValues) {
 		foreach ($indexValues as $index => $value) {
-			$ind = $this->_getIndex($index);
-			$this->_speProperties[$ind][$property] = $value;
+			$ind=$this->_getIndex($index);
+			$this->_speProperties[$ind][$property]=$value;
 		}
 	}
 
-	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();
@@ -175,65 +175,65 @@ 
 	}
 
 	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 fieldAsLabeledInput($index, $attributes = NULL) {
-		return $this->_fieldAs(function ($id, $name, $value, $caption) use ($attributes) {
-			$input = new HtmlFormInput($id, '', 'text', $value, $caption);
-			$required = '';
+	public function fieldAsLabeledInput($index, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) use ($attributes) {
+			$input=new HtmlFormInput($id, '', 'text', $value, $caption);
+			$required='';
 			if (isset($attributes['rules'])) {
-				$rules = json_encode($attributes['rules']);
-				if (strpos($rules, 'empty') !== false) {
-					$required = 'required';
+				$rules=json_encode($attributes['rules']);
+				if (strpos($rules, 'empty')!==false) {
+					$required='required';
 				}
 			}
 			$input->getField()
@@ -244,80 +244,80 @@ 
 		}, $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");
 	}
@@ -329,28 +329,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 {
@@ -363,39 +363,39 @@ 
 		}
 	}
 
-	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");
 	}
 
-	public function fieldAsDataTable($index, $model, $instances = null, $fields = [], $attributes = NULL) {
-		return $this->_fieldAs(function ($id, $name, $value, $caption) use ($model, $instances, $fields, $index) {
-			$dt = new DataTable($id, $model, $instances);
+	public function fieldAsDataTable($index, $model, $instances=null, $fields=[], $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) use ($model, $instances, $fields, $index) {
+			$dt=new DataTable($id, $model, $instances);
 			$dt->setNamePrefix($index);
 			$dt->setFields($fields);
 			$dt->setEdition(true);
-			$dt->addDeleteButton(false, [], function ($bt) use ($index) {
+			$dt->addDeleteButton(false, [], function($bt) use ($index) {
 				$bt->addClass('mini circular')
-					->wrap('<input value="" class="_status" type="hidden" name="' . $index . '._status[]">');
+					->wrap('<input value="" class="_status" type="hidden" name="'.$index.'._status[]">');
 			});
-			if ($caption != null) {
+			if ($caption!=null) {
 				$dt->setFormCaption($caption);
 			}
-			$dt->onPreCompile(function () use (&$dt) {
+			$dt->onPreCompile(function() use (&$dt) {
 				$dt->getHtmlComponent()
 					->colRightFromRight(0);
 			});
-			$dt->wrap('<input type="hidden" name="' . $index . '">');
+			$dt->wrap('<input type="hidden" name="'.$index.'">');
 			return $dt;
 		}, $index, $attributes, "dataTable");
 	}

Ajax/common/traits/JsUtilsActionsTrait.php

Braces +36 added lines, -24 removed lines

@@ -34,8 +34,9 @@ 
 			$callback = ", function(){\n{$callback}\n}";
 		}
 		$str = "$({$element}).{$action}({$speed}{$callback});";
-		if ($immediatly)
-			$this->jquery_code_for_compile [] = $str;
+		if ($immediatly) {
+					$this->jquery_code_for_compile [] = $str;
+		}
 		return $str;
 	}
 
@@ -73,10 +74,12 @@ 
 		if (isset ( $param )) {
 			$param = Javascript::prep_value ( $param );
 			$str = "$({$element}).{$jQueryCall}({$param});";
-		} else
-			$str = "$({$element}).{$jQueryCall}();";
-		if ($immediatly)
-			$this->jquery_code_for_compile [] = $str;
+		} else {
+					$str = "$({$element}).{$jQueryCall}();";
+		}
+		if ($immediatly) {
+					$this->jquery_code_for_compile [] = $str;
+		}
 		return $str;
 	}
 
@@ -94,8 +97,9 @@ 
 		$to = Javascript::prep_element ( $to );
 		$element = Javascript::prep_element ( $element );
 		$str = "$({$to}).{$jQueryCall}({$element});";
-		if ($immediatly)
-			$this->jquery_code_for_compile [] = $str;
+		if ($immediatly) {
+					$this->jquery_code_for_compile [] = $str;
+		}
 		return $str;
 	}
 
@@ -153,10 +157,12 @@ 
 		if (isset ( $value )) {
 			$value = Javascript::prep_value ( $value );
 			$str = "$({$element}).attr(\"$attributeName\",{$value});";
-		} else
-			$str = "$({$element}).attr(\"$attributeName\");";
-		if ($immediatly)
-			$this->jquery_code_for_compile [] = $str;
+		} else {
+					$str = "$({$element}).attr(\"$attributeName\");";
+		}
+		if ($immediatly) {
+					$this->jquery_code_for_compile [] = $str;
+		}
 		return $str;
 	}
 
@@ -219,8 +225,9 @@ 
 
 		$str = "$({$element}).animate({\n$animations\n\t\t}" . $speed . $extra . ");";
 
-		if ($immediatly)
-			$this->jquery_code_for_compile [] = $str;
+		if ($immediatly) {
+					$this->jquery_code_for_compile [] = $str;
+		}
 		return $str;
 	}
 
@@ -410,8 +417,9 @@ 
 		$element = Javascript::prep_element ( $element );
 		$str = "$({$element}).trigger(\"$event\");";
 
-		if ($immediatly)
-			$this->jquery_code_for_compile [] = $str;
+		if ($immediatly) {
+					$this->jquery_code_for_compile [] = $str;
+		}
 		return $str;
 	}
 
@@ -481,8 +489,9 @@ 
 			$str .= "else{" . $jsCodeIfFalse . "}";
 		}
 
-		if ($immediatly)
-			$this->jquery_code_for_compile [] = $str;
+		if ($immediatly) {
+					$this->jquery_code_for_compile [] = $str;
+		}
 		return $str;
 	}
 
@@ -500,11 +509,13 @@ 
 	private function _doJQuery($element, $jqueryCall, $param = "", $jsCallback = "", $immediatly = false) {
 		$param = Javascript::prep_value ( $param );
 		$callback = "";
-		if ($jsCallback != "")
-			$callback = ", function(event){\n{$jsCallback}\n}";
+		if ($jsCallback != "") {
+					$callback = ", function(event){\n{$jsCallback}\n}";
+		}
 		$script = "$(" . Javascript::prep_element ( $element ) . ")." . $jqueryCall . "(" . $param . $callback . ");\n";
-		if ($immediatly)
-			$this->jquery_code_for_compile [] = $script;
+		if ($immediatly) {
+					$this->jquery_code_for_compile [] = $script;
+		}
 		return $script;
 	}
 
@@ -591,8 +602,9 @@ 
 	 */
 	public function exec($js, $immediatly = false) {
 		$script = $js . "\n";
-		if ($immediatly)
-			$this->jquery_code_for_compile [] = $script;
+		if ($immediatly) {
+					$this->jquery_code_for_compile [] = $script;
+		}
 		return $script;
 	}
 

Spacing +180 added lines, -180 removed lines

@@ -12,7 +12,7 @@ 
  */
 trait JsUtilsActionsTrait {
 
-	abstract public function _add_event($element, $js, $event, $preventDefault = false, $stopPropagation = false, $immediatly = true, $listenerOn=false);
+	abstract public function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false, $immediatly=true, $listenerOn=false);
 
 	/**
 	 * show or hide with effect
@@ -28,15 +28,15 @@ 
 	 *        	defers the execution if set to false
 	 * @return string
 	 */
-	protected function _showHideWithEffect($action, $element = 'this', $speed = '', $callback = '', $immediatly = false) {
-		$element = Javascript::prep_element ( $element );
-		$speed = $this->_validate_speed ( $speed );
-		if ($callback != '') {
-			$callback = ", function(){\n{$callback}\n}";
+	protected function _showHideWithEffect($action, $element='this', $speed='', $callback='', $immediatly=false) {
+		$element=Javascript::prep_element($element);
+		$speed=$this->_validate_speed($speed);
+		if ($callback!='') {
+			$callback=", function(){\n{$callback}\n}";
 		}
-		$str = "$({$element}).{$action}({$speed}{$callback});";
+		$str="$({$element}).{$action}({$speed}{$callback});";
 		if ($immediatly)
-			$this->jquery_code_for_compile [] = $str;
+			$this->jquery_code_for_compile []=$str;
 		return $str;
 	}
 
@@ -47,14 +47,14 @@ 
 	 * @return string
 	 */
 	private function _validate_speed($speed) {
-		if (in_array ( $speed, array (
+		if (in_array($speed, array(
 				'slow',
 				'normal',
 				'fast'
-		) )) {
-			$speed = '"' . $speed . '"';
-		} elseif (preg_match ( "/[^0-9]/", $speed )) {
-			$speed = '';
+		))) {
+			$speed='"'.$speed.'"';
+		} elseif (preg_match("/[^0-9]/", $speed)) {
+			$speed='';
 		}
 
 		return $speed;
@@ -69,15 +69,15 @@ 
 	 * @param boolean $immediatly
 	 *        	delayed if false
 	 */
-	public function _genericCallValue($jQueryCall, $element = 'this', $param = "", $immediatly = false) {
-		$element = Javascript::prep_element ( $element );
-		if (isset ( $param )) {
-			$param = Javascript::prep_value ( $param );
-			$str = "$({$element}).{$jQueryCall}({$param});";
+	public function _genericCallValue($jQueryCall, $element='this', $param="", $immediatly=false) {
+		$element=Javascript::prep_element($element);
+		if (isset ($param)) {
+			$param=Javascript::prep_value($param);
+			$str="$({$element}).{$jQueryCall}({$param});";
 		} else
-			$str = "$({$element}).{$jQueryCall}();";
+			$str="$({$element}).{$jQueryCall}();";
 		if ($immediatly)
-			$this->jquery_code_for_compile [] = $str;
+			$this->jquery_code_for_compile []=$str;
 		return $str;
 	}
 
@@ -91,12 +91,12 @@ 
 	 *        	delayed if false
 	 * @return string
 	 */
-	public function _genericCallElement($jQueryCall, $to = 'this', $element = '', $immediatly = false) {
-		$to = Javascript::prep_element ( $to );
-		$element = Javascript::prep_element ( $element );
-		$str = "$({$to}).{$jQueryCall}({$element});";
+	public function _genericCallElement($jQueryCall, $to='this', $element='', $immediatly=false) {
+		$to=Javascript::prep_element($to);
+		$element=Javascript::prep_element($element);
+		$str="$({$to}).{$jQueryCall}({$element});";
 		if ($immediatly)
-			$this->jquery_code_for_compile [] = $str;
+			$this->jquery_code_for_compile []=$str;
 		return $str;
 	}
 
@@ -110,8 +110,8 @@ 
 	 *        	defers the execution if set to false
 	 * @return string
 	 */
-	public function addClass($element = 'this', $class = '', $immediatly = false) {
-		return $this->_genericCallValue ( 'addClass', $element, $class, $immediatly );
+	public function addClass($element='this', $class='', $immediatly=false) {
+		return $this->_genericCallValue('addClass', $element, $class, $immediatly);
 	}
 
 	/**
@@ -123,8 +123,8 @@ 
 	 *        	defers the execution if set to false
 	 * @return string
 	 */
-	public function after($to, $element, $immediatly = false) {
-		return $this->_genericCallElement ( 'after', $to, $element, $immediatly );
+	public function after($to, $element, $immediatly=false) {
+		return $this->_genericCallElement('after', $to, $element, $immediatly);
 	}
 
 	/**
@@ -136,8 +136,8 @@ 
 	 *        	defers the execution if set to false
 	 * @return string
 	 */
-	public function before($to, $element, $immediatly = false) {
-		return $this->_genericCallElement ( 'before', $to, $element, $immediatly );
+	public function before($to, $element, $immediatly=false) {
+		return $this->_genericCallElement('before', $to, $element, $immediatly);
 	}
 
 	/**
@@ -149,15 +149,15 @@ 
 	 * @param boolean $immediatly
 	 *        	delayed if false
 	 */
-	public function attr($element = 'this', $attributeName = 'id', $value = "", $immediatly = false) {
-		$element = Javascript::prep_element ( $element );
-		if (isset ( $value )) {
-			$value = Javascript::prep_value ( $value );
-			$str = "$({$element}).attr(\"$attributeName\",{$value});";
+	public function attr($element='this', $attributeName='id', $value="", $immediatly=false) {
+		$element=Javascript::prep_element($element);
+		if (isset ($value)) {
+			$value=Javascript::prep_value($value);
+			$str="$({$element}).attr(\"$attributeName\",{$value});";
 		} else
-			$str = "$({$element}).attr(\"$attributeName\");";
+			$str="$({$element}).attr(\"$attributeName\");";
 		if ($immediatly)
-			$this->jquery_code_for_compile [] = $str;
+			$this->jquery_code_for_compile []=$str;
 		return $str;
 	}
 
@@ -169,8 +169,8 @@ 
 	 * @param boolean $immediatly
 	 *        	defers the execution if set to false
 	 */
-	public function val($element = 'this', $value = '', $immediatly = false) {
-		return $this->_genericCallValue ( 'val', $element, $value, $immediatly );
+	public function val($element='this', $value='', $immediatly=false) {
+		return $this->_genericCallValue('val', $element, $value, $immediatly);
 	}
 
 	/**
@@ -181,8 +181,8 @@ 
 	 * @param boolean $immediatly
 	 *        	defers the execution if set to false
 	 */
-	public function html($element = 'this', $value = '', $immediatly = false) {
-		return $this->_genericCallValue ( 'html', $element, $value, $immediatly );
+	public function html($element='this', $value='', $immediatly=false) {
+		return $this->_genericCallValue('html', $element, $value, $immediatly);
 	}
 
 	/**
@@ -198,30 +198,30 @@ 
 	 *        	defers the execution if set to false
 	 * @return string
 	 */
-	public function animate($element = 'this', $params = array (), $speed = '', $extra = '', $immediatly = false) {
-		$element = Javascript::prep_element ( $element );
-		$speed = $this->_validate_speed ( $speed );
+	public function animate($element='this', $params=array(), $speed='', $extra='', $immediatly=false) {
+		$element=Javascript::prep_element($element);
+		$speed=$this->_validate_speed($speed);
 
-		$animations = "\t\t\t";
-		if (\is_array ( $params )) {
-			foreach ( $params as $param => $value ) {
-				$animations .= $param . ': \'' . $value . '\', ';
+		$animations="\t\t\t";
+		if (\is_array ($params)) {
+			foreach ($params as $param => $value) {
+				$animations.=$param.': \''.$value.'\', ';
 			}
 		}
-		$animations = substr ( $animations, 0, - 2 ); // remove the last ", "
+		$animations=substr($animations, 0, - 2); // remove the last ", "
 
-		if ($speed != '') {
-			$speed = ', ' . $speed;
+		if ($speed!='') {
+			$speed=', '.$speed;
 		}
 
-		if ($extra != '') {
-			$extra = ', ' . $extra;
+		if ($extra!='') {
+			$extra=', '.$extra;
 		}
 
-		$str = "$({$element}).animate({\n$animations\n\t\t}" . $speed . $extra . ");";
+		$str="$({$element}).animate({\n$animations\n\t\t}".$speed.$extra.");";
 
 		if ($immediatly)
-			$this->jquery_code_for_compile [] = $str;
+			$this->jquery_code_for_compile []=$str;
 		return $str;
 	}
 
@@ -234,8 +234,8 @@ 
 	 *        	defers the execution if set to false
 	 * @return string
 	 */
-	public function append($to, $element, $immediatly = false) {
-		return $this->_genericCallElement ( 'append', $to, $element, $immediatly );
+	public function append($to, $element, $immediatly=false) {
+		return $this->_genericCallElement('append', $to, $element, $immediatly);
 	}
 
 	/**
@@ -247,8 +247,8 @@ 
 	 *        	defers the execution if set to false
 	 * @return string
 	 */
-	public function prepend($to, $element, $immediatly = false) {
-		return $this->_genericCallElement ( 'prepend', $to, $element, $immediatly );
+	public function prepend($to, $element, $immediatly=false) {
+		return $this->_genericCallElement('prepend', $to, $element, $immediatly);
 	}
 
 	/**
@@ -264,8 +264,8 @@ 
 	 *        	defers the execution if set to false
 	 * @return string
 	 */
-	public function fadeIn($element = 'this', $speed = '', $callback = '', $immediatly = false) {
-		return $this->_showHideWithEffect ( "fadeIn", $element, $speed, $callback, $immediatly );
+	public function fadeIn($element='this', $speed='', $callback='', $immediatly=false) {
+		return $this->_showHideWithEffect("fadeIn", $element, $speed, $callback, $immediatly);
 	}
 
 	/**
@@ -281,8 +281,8 @@ 
 	 *        	defers the execution if set to false
 	 * @return string
 	 */
-	public function fadeOut($element = 'this', $speed = '', $callback = '', $immediatly = false) {
-		return $this->_showHideWithEffect ( "fadeOut", $element, $speed, $callback, $immediatly );
+	public function fadeOut($element='this', $speed='', $callback='', $immediatly=false) {
+		return $this->_showHideWithEffect("fadeOut", $element, $speed, $callback, $immediatly);
 	}
 
 	/**
@@ -298,8 +298,8 @@ 
 	 *        	defers the execution if set to false
 	 * @return string
 	 */
-	public function slideUp($element = 'this', $speed = '', $callback = '', $immediatly = false) {
-		return $this->_showHideWithEffect ( "slideUp", $element, $speed, $callback, $immediatly );
+	public function slideUp($element='this', $speed='', $callback='', $immediatly=false) {
+		return $this->_showHideWithEffect("slideUp", $element, $speed, $callback, $immediatly);
 	}
 
 	/**
@@ -313,8 +313,8 @@ 
 	 *        	defers the execution if set to false
 	 * @return string
 	 */
-	public function removeClass($element = 'this', $class = '', $immediatly = false) {
-		return $this->_genericCallValue ( 'removeClass', $element, $class, $immediatly );
+	public function removeClass($element='this', $class='', $immediatly=false) {
+		return $this->_genericCallValue('removeClass', $element, $class, $immediatly);
 	}
 
 	/**
@@ -330,8 +330,8 @@ 
 	 *        	defers the execution if set to false
 	 * @return string
 	 */
-	public function slideDown($element = 'this', $speed = '', $callback = '', $immediatly = false) {
-		return $this->_showHideWithEffect ( "slideDown", $element, $speed, $callback, $immediatly );
+	public function slideDown($element='this', $speed='', $callback='', $immediatly=false) {
+		return $this->_showHideWithEffect("slideDown", $element, $speed, $callback, $immediatly);
 	}
 
 	/**
@@ -347,8 +347,8 @@ 
 	 *        	defers the execution if set to false
 	 * @return string
 	 */
-	public function slideToggle($element = 'this', $speed = '', $callback = '', $immediatly = false) {
-		return $this->_showHideWithEffect ( "slideToggle", $element, $speed, $callback, $immediatly );
+	public function slideToggle($element='this', $speed='', $callback='', $immediatly=false) {
+		return $this->_showHideWithEffect("slideToggle", $element, $speed, $callback, $immediatly);
 	}
 
 	/**
@@ -364,8 +364,8 @@ 
 	 *        	defers the execution if set to false
 	 * @return string
 	 */
-	public function hide($element = 'this', $speed = '', $callback = '', $immediatly = false) {
-		return $this->_showHideWithEffect ( "hide", $element, $speed, $callback, $immediatly );
+	public function hide($element='this', $speed='', $callback='', $immediatly=false) {
+		return $this->_showHideWithEffect("hide", $element, $speed, $callback, $immediatly);
 	}
 
 	/**
@@ -381,8 +381,8 @@ 
 	 *        	defers the execution if set to false
 	 * @return string
 	 */
-	public function toggle($element = 'this', $speed = '', $callback = '', $immediatly = false) {
-		return $this->_showHideWithEffect ( "toggle", $element, $speed, $callback, $immediatly );
+	public function toggle($element='this', $speed='', $callback='', $immediatly=false) {
+		return $this->_showHideWithEffect("toggle", $element, $speed, $callback, $immediatly);
 	}
 
 	/**
@@ -395,8 +395,8 @@ 
 	 *        	defers the execution if set to false
 	 * @return string
 	 */
-	public function toggleClass($element = 'this', $class = '', $immediatly = false) {
-		return $this->_genericCallValue ( 'toggleClass', $element, $class, $immediatly );
+	public function toggleClass($element='this', $class='', $immediatly=false) {
+		return $this->_genericCallValue('toggleClass', $element, $class, $immediatly);
 	}
 
 	/**
@@ -407,12 +407,12 @@ 
 	 * @param boolean $immediatly
 	 *        	defers the execution if set to false
 	 */
-	public function trigger($element = 'this', $event = 'click', $immediatly = false) {
-		$element = Javascript::prep_element ( $element );
-		$str = "$({$element}).trigger(\"$event\");";
+	public function trigger($element='this', $event='click', $immediatly=false) {
+		$element=Javascript::prep_element($element);
+		$str="$({$element}).trigger(\"$event\");";
 
 		if ($immediatly)
-			$this->jquery_code_for_compile [] = $str;
+			$this->jquery_code_for_compile []=$str;
 		return $str;
 	}
 
@@ -429,8 +429,8 @@ 
 	 *        	defers the execution if set to false
 	 * @return string
 	 */
-	public function show($element = 'this', $speed = '', $callback = '', $immediatly = false) {
-		return $this->_showHideWithEffect ( "show", $element, $speed, $callback, $immediatly );
+	public function show($element='this', $speed='', $callback='', $immediatly=false) {
+		return $this->_showHideWithEffect("show", $element, $speed, $callback, $immediatly);
 	}
 
 	/**
@@ -440,18 +440,18 @@ 
 	 * @param array $options
 	 * @return string
 	 */
-	public function sortable($element, $options = array ()) {
-		if (count ( $options ) > 0) {
-			$sort_options = array ();
-			foreach ( $options as $k => $v ) {
-				$sort_options [] = "\n\t\t" . $k . ': ' . $v . "";
+	public function sortable($element, $options=array()) {
+		if (count($options)>0) {
+			$sort_options=array();
+			foreach ($options as $k => $v) {
+				$sort_options []="\n\t\t".$k.': '.$v."";
 			}
-			$sort_options = implode ( ",", $sort_options );
+			$sort_options=implode(",", $sort_options);
 		} else {
-			$sort_options = '';
+			$sort_options='';
 		}
 
-		return "$(" . Javascript::prep_element ( $element ) . ").sortable({" . $sort_options . "\n\t});";
+		return "$(".Javascript::prep_element($element).").sortable({".$sort_options."\n\t});";
 	}
 
 	/**
@@ -463,8 +463,8 @@ 
 	 *        	plugin location
 	 * @return string
 	 */
-	public function tablesorter($table = '', $options = '') {
-		$this->jquery_code_for_compile [] = "\t$(" . Javascript::prep_element ( $table ) . ").tablesorter($options);\n";
+	public function tablesorter($table='', $options='') {
+		$this->jquery_code_for_compile []="\t$(".Javascript::prep_element($table).").tablesorter($options);\n";
 	}
 
 	/**
@@ -476,14 +476,14 @@ 
 	 * @param boolean $immediatly
 	 *        	defers the execution if set to false
 	 */
-	public function condition($condition, $jsCodeIfTrue, $jsCodeIfFalse = null, $immediatly = false) {
-		$str = "if(" . $condition . "){" . $jsCodeIfTrue . "}";
-		if (isset ( $jsCodeIfFalse )) {
-			$str .= "else{" . $jsCodeIfFalse . "}";
+	public function condition($condition, $jsCodeIfTrue, $jsCodeIfFalse=null, $immediatly=false) {
+		$str="if(".$condition."){".$jsCodeIfTrue."}";
+		if (isset ($jsCodeIfFalse)) {
+			$str.="else{".$jsCodeIfFalse."}";
 		}
 
 		if ($immediatly)
-			$this->jquery_code_for_compile [] = $str;
+			$this->jquery_code_for_compile []=$str;
 		return $str;
 	}
 
@@ -498,14 +498,14 @@ 
 	 * @param boolean $immediatly
 	 * @return string
 	 */
-	private function _doJQuery($element, $jqueryCall, $param = "", $jsCallback = "", $immediatly = false) {
-		$param = Javascript::prep_value ( $param );
-		$callback = "";
-		if ($jsCallback != "")
-			$callback = ", function(event){\n{$jsCallback}\n}";
-		$script = "$(" . Javascript::prep_element ( $element ) . ")." . $jqueryCall . "(" . $param . $callback . ");\n";
+	private function _doJQuery($element, $jqueryCall, $param="", $jsCallback="", $immediatly=false) {
+		$param=Javascript::prep_value($param);
+		$callback="";
+		if ($jsCallback!="")
+			$callback=", function(event){\n{$jsCallback}\n}";
+		$script="$(".Javascript::prep_element($element).").".$jqueryCall."(".$param.$callback.");\n";
 		if ($immediatly)
-			$this->jquery_code_for_compile [] = $script;
+			$this->jquery_code_for_compile []=$script;
 		return $script;
 	}
 
@@ -522,8 +522,8 @@ 
 	 *        	javascript code to execute after the jquery call
 	 * @return mixed
 	 */
-	public function doJQuery($element, $jqueryCall, $param = "", $jsCallback = "") {
-		return $this->_doJQuery ( $element, $jqueryCall, $param, $jsCallback, true );
+	public function doJQuery($element, $jqueryCall, $param="", $jsCallback="") {
+		return $this->_doJQuery($element, $jqueryCall, $param, $jsCallback, true);
 	}
 
 	/**
@@ -539,8 +539,8 @@ 
 	 *        	javascript code to execute after the jquery call
 	 * @return mixed
 	 */
-	public function doJQueryDeferred($element, $jqueryCall, $param = "", $jsCallback = "") {
-		return $this->_doJQuery ( $element, $jqueryCall, $param, $jsCallback, false );
+	public function doJQueryDeferred($element, $jqueryCall, $param="", $jsCallback="") {
+		return $this->_doJQuery($element, $jqueryCall, $param, $jsCallback, false);
 	}
 
 	/**
@@ -557,8 +557,8 @@ 
 	 * @param boolean $immediatly
 	 * @return string
 	 */
-	private function _doJQueryOn($event, $element, $elementToModify, $jqueryCall, $param = "", $preventDefault = false, $stopPropagation = false, $jsCallback = "", $immediatly = true) {
-		return $this->_add_event ( $element, $this->_doJQuery ( $elementToModify, $jqueryCall, $param, $jsCallback ), $event, $preventDefault, $stopPropagation, $immediatly );
+	private function _doJQueryOn($event, $element, $elementToModify, $jqueryCall, $param="", $preventDefault=false, $stopPropagation=false, $jsCallback="", $immediatly=true) {
+		return $this->_add_event($element, $this->_doJQuery($elementToModify, $jqueryCall, $param, $jsCallback), $event, $preventDefault, $stopPropagation, $immediatly);
 	}
 
 	/**
@@ -572,13 +572,13 @@ 
 	 * @param array $parameters
 	 *        	default : array("preventDefault"=>false,"stopPropagation"=>false,"jsCallback"=>'',"immediatly"=>true)
 	 */
-	public function doJQueryOn($event, $element, $elementToModify, $jqueryCall, $param = "", $parameters = array ()) {
-		$jsCallback = "";
-		$stopPropagation = false;
-		$preventDefault = false;
-		$immediatly = true;
-		extract ( $parameters );
-		return $this->_doJQueryOn ( $event, $element, $elementToModify, $jqueryCall, $param, $preventDefault, $stopPropagation, $jsCallback, $immediatly );
+	public function doJQueryOn($event, $element, $elementToModify, $jqueryCall, $param="", $parameters=array()) {
+		$jsCallback="";
+		$stopPropagation=false;
+		$preventDefault=false;
+		$immediatly=true;
+		extract($parameters);
+		return $this->_doJQueryOn($event, $element, $elementToModify, $jqueryCall, $param, $preventDefault, $stopPropagation, $jsCallback, $immediatly);
 	}
 
 	/**
@@ -590,10 +590,10 @@ 
 	 *        	delayed if false
 	 * @return String
 	 */
-	public function exec($js, $immediatly = false) {
-		$script = $js . "\n";
+	public function exec($js, $immediatly=false) {
+		$script=$js."\n";
 		if ($immediatly)
-			$this->jquery_code_for_compile [] = $script;
+			$this->jquery_code_for_compile []=$script;
 		return $script;
 	}
 
@@ -607,8 +607,8 @@ 
 	 * @return String
 	 */
 	public function execAtLast($js) {
-		$script = $js . "\n";
-		$this->jquery_code_for_compile_at_last [] = $script;
+		$script=$js."\n";
+		$this->jquery_code_for_compile_at_last []=$script;
 		return $script;
 	}
 
@@ -623,18 +623,18 @@ 
 	 *        	default : array("preventDefault"=>false,"stopPropagation"=>false,"immediatly"=>true)
 	 * @return String
 	 */
-	public function execOn($event, $element, $js, $parameters = array ()) {
-		$stopPropagation = false;
-		$preventDefault = false;
-		$immediatly = true;
-		extract ( $parameters );
-		$script = $this->_add_event ( $element, $this->exec ( $js ), $event, $preventDefault, $stopPropagation, $immediatly );
+	public function execOn($event, $element, $js, $parameters=array()) {
+		$stopPropagation=false;
+		$preventDefault=false;
+		$immediatly=true;
+		extract($parameters);
+		$script=$this->_add_event($element, $this->exec($js), $event, $preventDefault, $stopPropagation, $immediatly);
 		return $script;
 	}
-	public function setJsonToElement($json, $elementClass = "_element", $immediatly = true) {
-		$retour = "var data={$json};" . "\n\tdata=($.isPlainObject(data))?data:JSON.parse(data);" . "\n\tvar pk=data['pk'];var object=data['object'];" . "\n\tfor(var field in object){" . "\n\tif($('[data-field='+field+']',$('._element[data-ajax='+pk+']')).length){" . "\n\t\t$('[data-field='+field+']',$('._element[data-ajax='+pk+']')).each(function(){" . "\n\t\t\tif($(this).is('[value]')) { $(this).val(object[field]);} else { $(this).html(object[field]); }" . "\n\t});" . "\n}};\n";
-		$retour .= "\t$(document).trigger('jsonReady',[data]);\n";
-		return $this->exec ( $retour, $immediatly );
+	public function setJsonToElement($json, $elementClass="_element", $immediatly=true) {
+		$retour="var data={$json};"."\n\tdata=($.isPlainObject(data))?data:JSON.parse(data);"."\n\tvar pk=data['pk'];var object=data['object'];"."\n\tfor(var field in object){"."\n\tif($('[data-field='+field+']',$('._element[data-ajax='+pk+']')).length){"."\n\t\t$('[data-field='+field+']',$('._element[data-ajax='+pk+']')).each(function(){"."\n\t\t\tif($(this).is('[value]')) { $(this).val(object[field]);} else { $(this).html(object[field]); }"."\n\t});"."\n}};\n";
+		$retour.="\t$(document).trigger('jsonReady',[data]);\n";
+		return $this->exec($retour, $immediatly);
 	}
 
 	/**
@@ -645,13 +645,13 @@ 
 	 * @param array $parameters
 	 *        	default : array("attr"=>"id","preventDefault"=>false,"stopPropagation"=>false,"immediatly"=>true)
 	 */
-	public function setDraggable($element, $parameters = [ ]) {
-		$attr = "id";
-		$preventDefault = false;
-		$stopPropagation = false;
-		$immediatly = true;
-		extract ( $parameters );
-		$script = $this->_add_event ( $element, Javascript::draggable ( $attr ), "dragstart", $preventDefault, $stopPropagation, $immediatly );
+	public function setDraggable($element, $parameters=[]) {
+		$attr="id";
+		$preventDefault=false;
+		$stopPropagation=false;
+		$immediatly=true;
+		extract($parameters);
+		$script=$this->_add_event($element, Javascript::draggable($attr), "dragstart", $preventDefault, $stopPropagation, $immediatly);
 		return $script;
 	}
 
@@ -665,13 +665,13 @@ 
 	 * @param string $jsCallback
 	 *        	the js script to call when element is dropped
 	 */
-	public function asDropZone($element, $jsCallback = "", $parameters = [ ]) {
-		$stopPropagation = false;
-		$immediatly = true;
-		$jqueryDone = "append";
-		$script = $this->_add_event ( $element, '', "dragover", true, $stopPropagation, $immediatly );
-		extract ( $parameters );
-		$script .= $this->_add_event ( $element, Javascript::dropZone ( $jqueryDone, $jsCallback ), "drop", true, $stopPropagation, $immediatly );
+	public function asDropZone($element, $jsCallback="", $parameters=[]) {
+		$stopPropagation=false;
+		$immediatly=true;
+		$jqueryDone="append";
+		$script=$this->_add_event($element, '', "dragover", true, $stopPropagation, $immediatly);
+		extract($parameters);
+		$script.=$this->_add_event($element, Javascript::dropZone($jqueryDone, $jsCallback), "drop", true, $stopPropagation, $immediatly);
 		return $script;
 	}
 
@@ -688,16 +688,16 @@ 
 	 *        	delayed if false
 	 * @return string
 	 */
-	public function interval($jsCode, $time, $globalName = null, $immediatly = true) {
-		if (! Javascript::isFunction ( $jsCode )) {
-			$jsCode = "function(){\n" . $jsCode . "\n}";
+	public function interval($jsCode, $time, $globalName=null, $immediatly=true) {
+		if (!Javascript::isFunction($jsCode)) {
+			$jsCode="function(){\n".$jsCode."\n}";
 		}
-		if (isset ( $globalName )) {
-			$script = "if(window.{$globalName}){clearInterval(window.{$globalName});}\nwindow.{$globalName}=setInterval({$jsCode},{$time});";
+		if (isset ($globalName)) {
+			$script="if(window.{$globalName}){clearInterval(window.{$globalName});}\nwindow.{$globalName}=setInterval({$jsCode},{$time});";
 		} else {
-			$script = "setInterval({$jsCode},{$time});";
+			$script="setInterval({$jsCode},{$time});";
 		}
-		return $this->exec ( $script, $immediatly );
+		return $this->exec($script, $immediatly);
 	}
 
 	/**
@@ -709,8 +709,8 @@ 
 	 *        	delayed if false
 	 * @return string
 	 */
-	public function clearInterval($globalName, $immediatly = true) {
-		return $this->exec ( "if(window.{$globalName}){clearInterval(window.{$globalName});}", $immediatly );
+	public function clearInterval($globalName, $immediatly=true) {
+		return $this->exec("if(window.{$globalName}){clearInterval(window.{$globalName});}", $immediatly);
 	}
 
 	/**
@@ -731,20 +731,20 @@ 
 	 *        	delayed if false
 	 * @return string
 	 */
-	public function counter($counterSelector, $value = 0, $limit = 0, $globalName = null, $countDown = true, $immediatly = true) {
-		$stop = "";
+	public function counter($counterSelector, $value=0, $limit=0, $globalName=null, $countDown=true, $immediatly=true) {
+		$stop="";
 		if ($countDown) {
-			$stop = "if (--timer < " . $limit . ") {clearInterval(interval);display.trigger({type:'counter-end',value: timer,limit:" . $limit . "});}";
+			$stop="if (--timer < ".$limit.") {clearInterval(interval);display.trigger({type:'counter-end',value: timer,limit:".$limit."});}";
 		} else {
-			if ($limit != 0) {
-				$stop = "if (++timer > " . $limit . ") {clearInterval(interval);display.trigger({type:'counter-end',value: timer,limit:" . $limit . "});}";
+			if ($limit!=0) {
+				$stop="if (++timer > ".$limit.") {clearInterval(interval);display.trigger({type:'counter-end',value: timer,limit:".$limit."});}";
 			}
 		}
-		$global = "";
-		if (isset ( $globalName )) {
-			$global = "\nwindow.{$globalName}=interval;";
+		$global="";
+		if (isset ($globalName)) {
+			$global="\nwindow.{$globalName}=interval;";
 		}
-		$timer = "var startTimer=function(duration, display) {var timer = duration, days, hours, minutes, seconds;
+		$timer="var startTimer=function(duration, display) {var timer = duration, days, hours, minutes, seconds;
 											var sh=function(disp,v){if(disp.is('[value]')){disp.val(v);} else {disp.html(v);};};
 											var shHide=function(v,k,kBefore){if(v==0 && display.find(k).closest('.timer').is(':visible') && (!kBefore || !display.find(kBefore).closest('.timer').is(':visible'))){display.find(k).closest('.timer').hide();}else{sh(display.find(k),v);}};
 											var pl=function(v,text){return (v>1)?v+' '+text+'s':(v>0)?v+' '+text:'';};
@@ -760,12 +760,12 @@ 
 												minutes = d0(parseInt((timer%3600) / 60, 10));
 												seconds = d0(parseInt(timer%60, 10));
 												mainSh(days,hours,minutes,seconds);
-												" . $stop . "
+												" . $stop."
     										}, 1000);
-										" . $global . "
+										" . $global."
 										}";
-		$element = '$("' . $counterSelector . '")';
-		return $this->exec ( $timer . "\nstartTimer(" . $value . "," . $element . ");", $immediatly );
+		$element='$("'.$counterSelector.'")';
+		return $this->exec($timer."\nstartTimer(".$value.",".$element.");", $immediatly);
 	}
 
 	/**
@@ -787,8 +787,8 @@ 
 	 *        	count down if true or elapse if false
 	 * @return string
 	 */
-	public function counterOn($element, $event, $counterSelector, $value = 0, $limit = 0, $globalName = null, $countDown = true) {
-		return $this->execOn ( $event, $element, $this->counter ( $counterSelector, $value, $limit, $globalName, $countDown, false ) );
+	public function counterOn($element, $event, $counterSelector, $value=0, $limit=0, $globalName=null, $countDown=true) {
+		return $this->execOn($event, $element, $this->counter($counterSelector, $value, $limit, $globalName, $countDown, false));
 	}
 
 	/**
@@ -802,8 +802,8 @@ 
 	 *        	the active href (if null, window.location.href is used)
 	 * @return string
 	 */
-	public function activateLink($target, $property = 'href', $href = null) {
-		return $this->execAtLast ( $this->_activateLink ( $target, $property, $href ) );
+	public function activateLink($target, $property='href', $href=null) {
+		return $this->execAtLast($this->_activateLink($target, $property, $href));
 	}
 
 	/**
@@ -817,14 +817,14 @@ 
 	 *        	the active href (if null, window.location.href is used)
 	 * @return string
 	 */
-	public function _activateLink($target, $property = 'href', $href = null) {
-		$js = '$("' . $target . ' [' . $property . ']").removeClass("active");';
-		if (isset ( $href )) {
-			$js .= 'var href="' . $href . '";';
+	public function _activateLink($target, $property='href', $href=null) {
+		$js='$("'.$target.' ['.$property.']").removeClass("active");';
+		if (isset ($href)) {
+			$js.='var href="'.$href.'";';
 		} else {
-			$js .= 'var href=window.location.href;';
+			$js.='var href=window.location.href;';
 		}
-		$js .= '$("' . $target . ' [' . $property . ']").each(function(){if(href.includes($(this).attr("' . $property . '"))) $(this).addClass("active");});';
+		$js.='$("'.$target.' ['.$property.']").each(function(){if(href.includes($(this).attr("'.$property.'"))) $(this).addClass("active");});';
 		return $js;
 	}
 }

Ajax/common/traits/JsUtilsEventsTrait.php

Spacing +48 added lines, -48 removed lines

@@ -10,7 +10,7 @@ 
  * @property array $jquery_code_for_compile
  */
 trait JsUtilsEventsTrait {
-	protected $jquery_events = [
+	protected $jquery_events=[
 			'bind',
 			'blur',
 			'change',
@@ -51,7 +51,7 @@ 
 			'unload'
 	];
 
-	abstract public function _add_event($element, $js, $event, $preventDefault = false, $stopPropagation = false, $immediatly = true, $listenerOn=false);
+	abstract public function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false, $immediatly=true, $listenerOn=false);
 
 	/**
 	 * Outputs a javascript library blur event
@@ -62,8 +62,8 @@ 
 	 *        	code to execute
 	 * @return string
 	 */
-	public function blur($element = 'this', $js = '', $preventDefault = false, $stopPropagation = false, $listenerOn=false) {
-		return $this->_add_event ( $element, $js, 'blur', $preventDefault, $stopPropagation, true, $listenerOn );
+	public function blur($element='this', $js='', $preventDefault=false, $stopPropagation=false, $listenerOn=false) {
+		return $this->_add_event($element, $js, 'blur', $preventDefault, $stopPropagation, true, $listenerOn);
 	}
 
 	/**
@@ -78,8 +78,8 @@ 
 	 * @param boolean|string $listenerOn use a selector for a delegated event handler 
 	 * @return string
 	 */
-	public function change($element = 'this', $js = '', $preventDefault = false, $stopPropagation = false, $listenerOn=false) {
-		return $this->_add_event ( $element, $js, 'change', $preventDefault, $stopPropagation, true, $listenerOn );
+	public function change($element='this', $js='', $preventDefault=false, $stopPropagation=false, $listenerOn=false) {
+		return $this->_add_event($element, $js, 'change', $preventDefault, $stopPropagation, true, $listenerOn);
 	}
 
 	/**
@@ -96,18 +96,18 @@ 
 	 * @param boolean|string $listenerOn use a selector for a delegated event handler
 	 * @return string
 	 */
-	public function click($element = 'this', $js = '', $ret_false = TRUE, $preventDefault = false, $stopPropagation = false, $listenerOn=false) {
-		if (! is_array ( $js )) {
-			$js = array (
+	public function click($element='this', $js='', $ret_false=TRUE, $preventDefault=false, $stopPropagation=false, $listenerOn=false) {
+		if (!is_array($js)) {
+			$js=array(
 					$js
 			);
 		}
 
 		if ($ret_false) {
-			$js [] = "return false;";
+			$js []="return false;";
 		}
 
-		return $this->_add_event ( $element, $js, 'click', $preventDefault, $stopPropagation, true, $listenerOn );
+		return $this->_add_event($element, $js, 'click', $preventDefault, $stopPropagation, true, $listenerOn);
 	}
 
 	/**
@@ -122,8 +122,8 @@ 
 	 * @param boolean|string $listenerOn use a selector for a delegated event handler
 	 * @return string
 	 */
-	public function contextmenu($element = 'this', $js = '', $preventDefault = false, $stopPropagation = false, $listenerOn=false) {
-		return $this->_add_event ( $element, $js, 'contextmenu', $preventDefault, $stopPropagation, true, $listenerOn );
+	public function contextmenu($element='this', $js='', $preventDefault=false, $stopPropagation=false, $listenerOn=false) {
+		return $this->_add_event($element, $js, 'contextmenu', $preventDefault, $stopPropagation, true, $listenerOn);
 	}
 
 	/**
@@ -138,8 +138,8 @@ 
 	 * @param boolean|string $listenerOn use a selector for a delegated event handler
 	 * @return string
 	 */
-	public function dblclick($element = 'this', $js = '', $preventDefault = false, $stopPropagation = false, $listenerOn=false) {
-		return $this->_add_event ( $element, $js, 'dblclick', $preventDefault, $stopPropagation, true, $listenerOn );
+	public function dblclick($element='this', $js='', $preventDefault=false, $stopPropagation=false, $listenerOn=false) {
+		return $this->_add_event($element, $js, 'dblclick', $preventDefault, $stopPropagation, true, $listenerOn);
 	}
 
 	/**
@@ -151,8 +151,8 @@ 
 	 *        	code to execute
 	 * @return string
 	 */
-	public function error($element = 'this', $js = '') {
-		return $this->_add_event ( $element, $js, 'error' );
+	public function error($element='this', $js='') {
+		return $this->_add_event($element, $js, 'error');
 	}
 
 	/**
@@ -167,8 +167,8 @@ 
 	 * @param boolean|string $listenerOn use a selector for a delegated event handler
 	 * @return string
 	 */
-	public function focus($element = 'this', $js = '', $preventDefault = false, $stopPropagation = false, $listenerOn=false) {
-		return $this->_add_event ( $element, $js, 'focus', $preventDefault, $stopPropagation, true, $listenerOn );
+	public function focus($element='this', $js='', $preventDefault=false, $stopPropagation=false, $listenerOn=false) {
+		return $this->_add_event($element, $js, 'focus', $preventDefault, $stopPropagation, true, $listenerOn);
 	}
 
 	/**
@@ -181,9 +181,9 @@ 
 	 *        	code for mouse out
 	 * @return string
 	 */
-	public function hover($element = 'this', $over = '', $out = '') {
-		$event = "\n\t$(" . Javascript::prep_element ( $element ) . ").hover(\n\t\tfunction()\n\t\t{\n\t\t\t{$over}\n\t\t}, \n\t\tfunction()\n\t\t{\n\t\t\t{$out}\n\t\t});\n";
-		$this->jquery_code_for_compile [] = $event;
+	public function hover($element='this', $over='', $out='') {
+		$event="\n\t$(".Javascript::prep_element($element).").hover(\n\t\tfunction()\n\t\t{\n\t\t\t{$over}\n\t\t}, \n\t\tfunction()\n\t\t{\n\t\t\t{$out}\n\t\t});\n";
+		$this->jquery_code_for_compile []=$event;
 		return $event;
 	}
 
@@ -199,8 +199,8 @@ 
 	 * @param boolean|string $listenerOn use a selector for a delegated event handler
 	 * @return string
 	 */
-	public function keydown($element = 'this', $js = '', $preventDefault = false, $stopPropagation = false, $listenerOn=false) {
-		return $this->_add_event ( $element, $js, 'keydown', $preventDefault, $stopPropagation, true, $listenerOn );
+	public function keydown($element='this', $js='', $preventDefault=false, $stopPropagation=false, $listenerOn=false) {
+		return $this->_add_event($element, $js, 'keydown', $preventDefault, $stopPropagation, true, $listenerOn);
 	}
 
 	/**
@@ -215,8 +215,8 @@ 
 	 * @param boolean|string $listenerOn use a selector for a delegated event handler
 	 * @return string
 	 */
-	public function keypress($element = 'this', $js = '', $preventDefault = false, $stopPropagation = false, $listenerOn=false) {
-		return $this->_add_event ( $element, $js, 'keypress', $preventDefault, $stopPropagation, true, $listenerOn );
+	public function keypress($element='this', $js='', $preventDefault=false, $stopPropagation=false, $listenerOn=false) {
+		return $this->_add_event($element, $js, 'keypress', $preventDefault, $stopPropagation, true, $listenerOn);
 	}
 
 	/**
@@ -231,8 +231,8 @@ 
 	 * @param boolean|string $listenerOn use a selector for a delegated event handler
 	 * @return string
 	 */
-	public function keyup($element = 'this', $js = '', $preventDefault = false, $stopPropagation = false, $listenerOn=false) {
-		return $this->_add_event ( $element, $js, 'keyup', $preventDefault, $stopPropagation, true, $listenerOn );
+	public function keyup($element='this', $js='', $preventDefault=false, $stopPropagation=false, $listenerOn=false) {
+		return $this->_add_event($element, $js, 'keyup', $preventDefault, $stopPropagation, true, $listenerOn);
 	}
 
 	/**
@@ -247,8 +247,8 @@ 
 	 * @param boolean|string $listenerOn use a selector for a delegated event handler
 	 * @return string
 	 */
-	public function load($element = 'this', $js = '', $preventDefault = false, $stopPropagation = false, $listenerOn=false) {
-		return $this->_add_event ( $element, $js, 'load', $preventDefault, $stopPropagation, true, $listenerOn );
+	public function load($element='this', $js='', $preventDefault=false, $stopPropagation=false, $listenerOn=false) {
+		return $this->_add_event($element, $js, 'load', $preventDefault, $stopPropagation, true, $listenerOn);
 	}
 
 	/**
@@ -263,8 +263,8 @@ 
 	 * @param boolean|string $listenerOn use a selector for a delegated event handler
 	 * @return string
 	 */
-	public function mousedown($element = 'this', $js = '', $preventDefault = false, $stopPropagation = false, $listenerOn=false) {
-		return $this->_add_event ( $element, $js, 'mousedown', $preventDefault, $stopPropagation, true, $listenerOn );
+	public function mousedown($element='this', $js='', $preventDefault=false, $stopPropagation=false, $listenerOn=false) {
+		return $this->_add_event($element, $js, 'mousedown', $preventDefault, $stopPropagation, true, $listenerOn);
 	}
 
 	/**
@@ -279,8 +279,8 @@ 
 	 * @param boolean|string $listenerOn use a selector for a delegated event handler
 	 * @return string
 	 */
-	public function mouseout($element = 'this', $js = '', $preventDefault = false, $stopPropagation = false, $listenerOn=false) {
-		return $this->_add_event ( $element, $js, 'mouseout', $preventDefault, $stopPropagation, true, $listenerOn );
+	public function mouseout($element='this', $js='', $preventDefault=false, $stopPropagation=false, $listenerOn=false) {
+		return $this->_add_event($element, $js, 'mouseout', $preventDefault, $stopPropagation, true, $listenerOn);
 	}
 
 	/**
@@ -295,8 +295,8 @@ 
 	 * @param boolean|string $listenerOn use a selector for a delegated event handler
 	 * @return string
 	 */
-	public function mouseleave($element = 'this', $js = '', $preventDefault = false, $stopPropagation = false, $listenerOn=false) {
-		return $this->_add_event ( $element, $js, 'mouseleave', $preventDefault, $stopPropagation, true, $listenerOn );
+	public function mouseleave($element='this', $js='', $preventDefault=false, $stopPropagation=false, $listenerOn=false) {
+		return $this->_add_event($element, $js, 'mouseleave', $preventDefault, $stopPropagation, true, $listenerOn);
 	}
 
 	/**
@@ -311,8 +311,8 @@ 
 	 * @param boolean|string $listenerOn use a selector for a delegated event handler
 	 * @return string
 	 */
-	public function mouseenter($element = 'this', $js = '', $preventDefault = false, $stopPropagation = false, $listenerOn=false) {
-		return $this->_add_event ( $element, $js, 'mouseenter', $preventDefault, $stopPropagation, true, $listenerOn );
+	public function mouseenter($element='this', $js='', $preventDefault=false, $stopPropagation=false, $listenerOn=false) {
+		return $this->_add_event($element, $js, 'mouseenter', $preventDefault, $stopPropagation, true, $listenerOn);
 	}
 
 	/**
@@ -327,8 +327,8 @@ 
 	 * @param boolean|string $listenerOn use a selector for a delegated event handler
 	 * @return string
 	 */
-	public function mouseover($element = 'this', $js = '', $preventDefault = false, $stopPropagation = false, $listenerOn=false) {
-		return $this->_add_event ( $element, $js, 'mouseover', $preventDefault, $stopPropagation, true, $listenerOn );
+	public function mouseover($element='this', $js='', $preventDefault=false, $stopPropagation=false, $listenerOn=false) {
+		return $this->_add_event($element, $js, 'mouseover', $preventDefault, $stopPropagation, true, $listenerOn);
 	}
 
 	/**
@@ -343,8 +343,8 @@ 
 	 * @param boolean|string $listenerOn use a selector for a delegated event handler
 	 * @return string
 	 */
-	public function mouseup($element = 'this', $js = '', $preventDefault = false, $stopPropagation = false, $listenerOn=false) {
-		return $this->_add_event ( $element, $js, 'mouseup', $preventDefault, $stopPropagation, true, $listenerOn );
+	public function mouseup($element='this', $js='', $preventDefault=false, $stopPropagation=false, $listenerOn=false) {
+		return $this->_add_event($element, $js, 'mouseup', $preventDefault, $stopPropagation, true, $listenerOn);
 	}
 
 	/**
@@ -359,8 +359,8 @@ 
 	 * @param boolean|string $listenerOn use a selector for a delegated event handler
 	 * @return string
 	 */
-	public function unload($element = 'this', $js = '', $preventDefault = false, $stopPropagation = false, $listenerOn=false) {
-		return $this->_add_event ( $element, $js, 'unload', $preventDefault, $stopPropagation, true, $listenerOn );
+	public function unload($element='this', $js='', $preventDefault=false, $stopPropagation=false, $listenerOn=false) {
+		return $this->_add_event($element, $js, 'unload', $preventDefault, $stopPropagation, true, $listenerOn);
 	}
 
 	// --------------------------------------------------------------------
@@ -376,8 +376,8 @@ 
 	 * @param boolean|string $listenerOn use a selector for a delegated event handler
 	 * @return string
 	 */
-	public function resize($element = 'this', $js = '', $preventDefault = false, $stopPropagation = false, $listenerOn=false) {
-		return $this->_add_event ( $element, $js, 'resize', $preventDefault, $stopPropagation, true, $listenerOn );
+	public function resize($element='this', $js='', $preventDefault=false, $stopPropagation=false, $listenerOn=false) {
+		return $this->_add_event($element, $js, 'resize', $preventDefault, $stopPropagation, true, $listenerOn);
 	}
 
 	// --------------------------------------------------------------------
@@ -393,7 +393,7 @@ 
 	 * @param boolean|string $listenerOn use a selector for a delegated event handler
 	 * @return string
 	 */
-	public function scroll($element = 'this', $js = '', $preventDefault = false, $stopPropagation = false, $listenerOn=false) {
-		return $this->_add_event ( $element, $js, 'scroll', $preventDefault, $stopPropagation, true, $listenerOn );
+	public function scroll($element='this', $js='', $preventDefault=false, $stopPropagation=false, $listenerOn=false) {
+		return $this->_add_event($element, $js, 'scroll', $preventDefault, $stopPropagation, true, $listenerOn);
 	}
 }