phpMv / phpMv-UI

Ajax/semantic/html/modules/HtmlDropdown.php

Spacing +91 added lines, -91 removed lines

@@ -13,17 +13,17 @@ 
 use Ajax\service\JArray;
 
 class HtmlDropdown extends HtmlSemDoubleElement {
-	use FieldTrait,LabeledIconTrait {
+	use FieldTrait, LabeledIconTrait {
 		addIcon as addIconP;
 	}
 
-	protected $mClass = "menu";
+	protected $mClass="menu";
 
-	protected $mTagName = "div";
+	protected $mTagName="div";
 
-	protected $items = array();
+	protected $items=array();
 
-	protected $_params = array(
+	protected $_params=array(
 		"action" => "nothing",
 		"on" => "hover",
 		"showOnFocus" => true
@@ -37,26 +37,26 @@ 
 
 	protected $_multiple;
 
-	public function __construct($identifier, $value = "", $items = array(), $associative = true) {
+	public function __construct($identifier, $value="", $items=array(), $associative=true) {
 		parent::__construct($identifier, "div");
-		$this->_template = include dirname(__FILE__) . '/../templates/tplDropdown.php';
+		$this->_template=include dirname(__FILE__).'/../templates/tplDropdown.php';
 		$this->setProperty("class", "ui dropdown");
-		$this->_multiple = false;
-		$content = [];
+		$this->_multiple=false;
+		$content=[];
 		if ($value instanceof HtmlSemDoubleElement) {
-			$text = $value;
+			$text=$value;
 		} else {
-			$text = new HtmlSemDoubleElement("text-" . $this->identifier, "div");
+			$text=new HtmlSemDoubleElement("text-".$this->identifier, "div");
 			$text->setClass("text");
 			$this->setValue($value);
 		}
-		$content = [
+		$content=[
 			"text" => $text
 		];
-		$content["arrow"] = new HtmlIcon($identifier . "-icon", "dropdown");
-		$this->content = $content;
-		$this->tagName = "div";
-		$this->_associative = $associative;
+		$content["arrow"]=new HtmlIcon($identifier."-icon", "dropdown");
+		$this->content=$content;
+		$this->tagName="div";
+		$this->_associative=$associative;
 		$this->addItems($items);
 	}
 
@@ -68,16 +68,16 @@ 
 		return $this->input;
 	}
 
-	public function addItem($item, $value = NULL, $image = NULL, $description = NULL) {
-		$itemO = $this->beforeAddItem($item, $value, $image, $description);
-		$this->items[] = $itemO;
+	public function addItem($item, $value=NULL, $image=NULL, $description=NULL) {
+		$itemO=$this->beforeAddItem($item, $value, $image, $description);
+		$this->items[]=$itemO;
 		return $itemO;
 	}
 
-	public function addIcon($icon, $before = true, $labeled = false) {
+	public function addIcon($icon, $before=true, $labeled=false) {
 		$this->removeArrow();
 		$this->addIconP($icon, $before, $labeled);
-		$elm = $this->getElementById("text-" . $this->identifier, $this->content);
+		$elm=$this->getElementById("text-".$this->identifier, $this->content);
 		if (isset($elm)) {
 			$elm->setWrapAfter("");
 		}
@@ -85,8 +85,8 @@ 
 	}
 
 	public function addIcons($icons) {
-		$count = $this->count();
-		for ($i = 0; $i < \sizeof($icons) && $i < $count; $i ++) {
+		$count=$this->count();
+		for ($i=0; $i<\sizeof($icons) && $i<$count; $i++) {
 			$this->getItem($i)->addIcon($icons[$i]);
 		}
 	}
@@ -98,32 +98,32 @@ 
 	 * @param int $position
 	 * @return HtmlDropdownItem
 	 */
-	public function insertItem($item, $position = 0) {
-		$itemO = $this->beforeAddItem($item);
-		$start = array_slice($this->items, 0, $position);
-		$end = array_slice($this->items, $position);
-		$start[] = $item;
-		$this->items = array_merge($start, $end);
+	public function insertItem($item, $position=0) {
+		$itemO=$this->beforeAddItem($item);
+		$start=array_slice($this->items, 0, $position);
+		$end=array_slice($this->items, $position);
+		$start[]=$item;
+		$this->items=array_merge($start, $end);
 		return $itemO;
 	}
 
 	protected function removeArrow() {
-		if (\sizeof($this->content) > 1) {
+		if (\sizeof($this->content)>1) {
 			unset($this->content["arrow"]);
-			$this->content = \array_values($this->content);
+			$this->content=\array_values($this->content);
 		}
 	}
 
-	protected function beforeAddItem($item, $value = NULL, $image = NULL, $description = NULL) {
-		$itemO = $item;
+	protected function beforeAddItem($item, $value=NULL, $image=NULL, $description=NULL) {
+		$itemO=$item;
 		if (\is_array($item)) {
-			$description = JArray::getValue($item, "description", 3);
-			$value = JArray::getValue($item, "value", 1);
-			$image = JArray::getValue($item, "image", 2);
-			$item = JArray::getValue($item, "item", 0);
+			$description=JArray::getValue($item, "description", 3);
+			$value=JArray::getValue($item, "value", 1);
+			$image=JArray::getValue($item, "image", 2);
+			$item=JArray::getValue($item, "item", 0);
 		}
-		if (! $item instanceof HtmlDropdownItem) {
-			$itemO = new HtmlDropdownItem("dd-item-" . $this->identifier . "-" . \sizeof($this->items), $item, $value, $image, $description);
+		if (!$item instanceof HtmlDropdownItem) {
+			$itemO=new HtmlDropdownItem("dd-item-".$this->identifier."-".\sizeof($this->items), $item, $value, $image, $description);
 		} elseif ($itemO instanceof HtmlDropdownItem) {
 			$this->addToProperty("class", "vertical");
 		}
@@ -139,11 +139,11 @@ 
 	}
 
 	public function addInput($name) {
-		if (! isset($name))
-			$name = "input-" . $this->identifier;
+		if (!isset($name))
+			$name="input-".$this->identifier;
 		$this->setAction("activate");
-		$this->input = new HtmlInput($name, "hidden");
-		$this->input->setIdentifier("input-" . $this->identifier);
+		$this->input=new HtmlInput($name, "hidden");
+		$this->input->setIdentifier("input-".$this->identifier);
 		return $this->input;
 	}
 
@@ -154,7 +154,7 @@ 
 	 * @param string $icon
 	 * @return HtmlDropdownItem
 	 */
-	public function addSearchInputItem($placeHolder = NULL, $icon = NULL) {
+	public function addSearchInputItem($placeHolder=NULL, $icon=NULL) {
 		return $this->addItem(HtmlDropdownItem::searchInput($placeHolder, $icon));
 	}
 
@@ -174,7 +174,7 @@ 
 	 * @param string $icon
 	 * @return HtmlDropdownItem
 	 */
-	public function addHeaderItem($caption = NULL, $icon = NULL) {
+	public function addHeaderItem($caption=NULL, $icon=NULL) {
 		return $this->addItem(HtmlDropdownItem::header($caption, $icon));
 	}
 
@@ -219,12 +219,12 @@ 
 	 * @return $this
 	 */
 	public function setPropertyValues($property, $values) {
-		$i = 0;
-		if (\is_array($values) === false) {
-			$values = \array_fill(0, $this->count(), $values);
+		$i=0;
+		if (\is_array($values)===false) {
+			$values=\array_fill(0, $this->count(), $values);
 		}
 		foreach ($values as $value) {
-			$c = $this->items[$i ++];
+			$c=$this->items[$i++];
 			if (isset($c)) {
 				$c->setProperty($property, $value);
 			} else {
@@ -258,12 +258,12 @@ 
 	 * @param boolean $dropdown
 	 */
 	public function asDropdown($dropdown) {
-		if ($dropdown === false) {
-			$this->_template = include dirname(__FILE__) . '/../templates/tplDropdownMenu.php';
-			$dropdown = "menu";
+		if ($dropdown===false) {
+			$this->_template=include dirname(__FILE__).'/../templates/tplDropdownMenu.php';
+			$dropdown="menu";
 		} else {
-			$dropdown = "dropdown";
-			$this->mClass = "menu";
+			$dropdown="dropdown";
+			$this->mClass="menu";
 		}
 		return $this->addToPropertyCtrl("class", $dropdown, array(
 			"menu",
@@ -289,7 +289,7 @@ 
 		));
 	}
 
-	public function asButton($floating = false) {
+	public function asButton($floating=false) {
 		$this->removeArrow();
 		if ($floating)
 			$this->addToProperty("class", "floating");
@@ -297,15 +297,15 @@ 
 		return $this->addToProperty("class", "button");
 	}
 
-	public function asSelect($name = NULL, $multiple = false, $selection = true) {
-		$this->_multiple = $multiple;
+	public function asSelect($name=NULL, $multiple=false, $selection=true) {
+		$this->_multiple=$multiple;
 		if (isset($name))
 			$this->addInput($name);
 		if ($multiple) {
 			$this->addToProperty("class", "multiple");
 		}
 		if ($selection) {
-			if ($this->propertyContains("class", "button") === false)
+			if ($this->propertyContains("class", "button")===false)
 				$this->addToPropertyCtrl("class", "selection", array(
 					"selection"
 				));
@@ -313,31 +313,31 @@ 
 		return $this;
 	}
 
-	public function asSearch($name = NULL, $multiple = false, $selection = true) {
+	public function asSearch($name=NULL, $multiple=false, $selection=true) {
 		$this->asSelect($name, $multiple, $selection);
 		return $this->addToProperty("class", "search");
 	}
 
-	public function setSelect($name = NULL, $multiple = false) {
-		$this->_template = '<%tagName% id="%identifier%" %properties%>%items%</%tagName%>';
-		if (! isset($name))
-			$name = "select-" . $this->identifier;
-		$this->input = null;
+	public function setSelect($name=NULL, $multiple=false) {
+		$this->_template='<%tagName% id="%identifier%" %properties%>%items%</%tagName%>';
+		if (!isset($name))
+			$name="select-".$this->identifier;
+		$this->input=null;
 		if ($multiple) {
 			$this->setProperty("multiple", true);
 			$this->addToProperty("class", "multiple");
 		}
 		$this->setAction("activate");
-		$this->tagName = "select";
+		$this->tagName="select";
 		$this->setProperty("name", $name);
-		$this->content = null;
+		$this->content=null;
 		foreach ($this->items as $item) {
 			$item->asOption();
 		}
 		return $this;
 	}
 
-	public function asSubmenu($pointing = NULL) {
+	public function asSubmenu($pointing=NULL) {
 		$this->setClass("ui dropdown link item");
 		if (isset($pointing)) {
 			$this->setPointing($pointing);
@@ -345,28 +345,28 @@ 
 		return $this;
 	}
 
-	public function setPointing($value = Direction::NONE) {
-		return $this->addToPropertyCtrl("class", $value . " pointing", Direction::getConstantValues("pointing"));
+	public function setPointing($value=Direction::NONE) {
+		return $this->addToPropertyCtrl("class", $value." pointing", Direction::getConstantValues("pointing"));
 	}
 
 	public function setValue($value) {
-		$this->value = $value;
+		$this->value=$value;
 		return $this;
 	}
 
 	public function setDefaultText($text) {
-		$this->content["text"] = new HtmlSemDoubleElement("", "div", "default text", $text);
+		$this->content["text"]=new HtmlSemDoubleElement("", "div", "default text", $text);
 	}
 
 	private function applyValue() {
-		$value = $this->value;
+		$value=$this->value;
 		if (isset($this->input) && isset($value)) {
 			$this->input->setProperty("value", $value);
 		} else {
 			$this->setProperty("value", $value);
 		}
-		$textElement = $this->getElementById("text-" . $this->identifier, $this->content);
-		if (isset($textElement) && ($textElement instanceof HtmlDoubleElement) && ! $this->_multiple)
+		$textElement=$this->getElementById("text-".$this->identifier, $this->content);
+		if (isset($textElement) && ($textElement instanceof HtmlDoubleElement) && !$this->_multiple)
 			$textElement->setContent($value);
 		return $this;
 	}
@@ -376,9 +376,9 @@ 
 	 * @see BaseHtml::run()
 	 */
 	public function run(JsUtils $js) {
-		if ($this->propertyContains("class", "simple") === false) {
-			if (isset($this->_bsComponent) === false) {
-				$this->_bsComponent = $js->semantic()->dropdown("#" . $this->identifier, $this->_params);
+		if ($this->propertyContains("class", "simple")===false) {
+			if (isset($this->_bsComponent)===false) {
+				$this->_bsComponent=$js->semantic()->dropdown("#".$this->identifier, $this->_params);
 				$this->_bsComponent->setItemSelector(".item");
 			}
 			$this->addEventsOnRun($js);
@@ -393,26 +393,26 @@ 
 	}
 
 	public function setAction($action) {
-		$this->_params["action"] = $action;
+		$this->_params["action"]=$action;
 	}
 
 	public function setOn($on) {
-		$this->_params["on"] = $on;
+		$this->_params["on"]=$on;
 	}
 
 	public function setShowOnFocus($value) {
-		$this->_params["showOnFocus"] = $value;
+		$this->_params["showOnFocus"]=$value;
 	}
 
 	public function setAllowAdditions($value) {
-		$this->_params["allowAdditions"] = $value;
+		$this->_params["allowAdditions"]=$value;
 	}
 
 	public function setFullTextSearch($value) {
-		$this->_params["fullTextSearch"] = $value;
+		$this->_params["fullTextSearch"]=$value;
 	}
 
-	public function compile(JsUtils $js = NULL, &$view = NULL) {
+	public function compile(JsUtils $js=NULL, &$view=NULL) {
 		$this->applyValue();
 		return parent::compile($js, $view);
 	}
@@ -421,19 +421,19 @@ 
 		return $this->input;
 	}
 
-	public function setIcon($icon = "dropdown") {
-		$this->content["arrow"] = new HtmlIcon($this->identifier . "-icon", $icon);
+	public function setIcon($icon="dropdown") {
+		$this->content["arrow"]=new HtmlIcon($this->identifier."-icon", $icon);
 		return $this;
 	}
 
-	public function jsAddItem($caption, $value = null) {
-		$value = $value ?? $caption;
-		$js = "var first=$('#{$this->identifier} .item').first();if(first!=undefined){var newItem =first.clone();first.parent().append(newItem);newItem.html({$caption});newItem.attr('data-value',{$value}).removeClass('active filtered');}";
+	public function jsAddItem($caption, $value=null) {
+		$value=$value ?? $caption;
+		$js="var first=$('#{$this->identifier} .item').first();if(first!=undefined){var newItem =first.clone();first.parent().append(newItem);newItem.html({$caption});newItem.attr('data-value',{$value}).removeClass('active filtered');}";
 		return $js;
 	}
 
 	public function setClearable($value) {
-		$this->_params["clearable"] = $value;
+		$this->_params["clearable"]=$value;
 	}
 
 	/**
@@ -441,7 +441,7 @@ 
 	 * Parameters addedValue, addedText, $addedChoice
 	 */
 	public function setOnAdd($jsCode) {
-		$this->_params["onAdd"] = $jsCode;
+		$this->_params["onAdd"]=$jsCode;
 		return $this;
 	}
 
@@ -450,7 +450,7 @@ 
 	 * Parameters removedValue, removedText, $removedChoice
 	 */
 	public function setOnRemove($jsCode) {
-		$this->_params["onRemove"] = $jsCode;
+		$this->_params["onRemove"]=$jsCode;
 		return $this;
 	}
 }

Ajax/service/JArray.php

Spacing +38 added lines, -38 removed lines

@@ -4,34 +4,34 @@ 
 class JArray {
 
 	public static function isAssociative($array) {
-		return (array_values($array) !== $array);
+		return (array_values($array)!==$array);
 	}
 
 	public static function getValue($array, $key, $pos) {
 		if (array_key_exists($key, $array)) {
 			return $array[$key];
 		}
-		$values = array_values($array);
-		if ($pos < sizeof($values))
+		$values=array_values($array);
+		if ($pos<sizeof($values))
 			return $values[$pos];
 	}
 
 	public static function getConditionalValue($array, $key, $condition) {
-		$result = NULL;
+		$result=NULL;
 		if (array_key_exists($key, $array)) {
-			$result = $array[$key];
-			if ($condition($result) === true)
+			$result=$array[$key];
+			if ($condition($result)===true)
 				return $result;
 		}
-		$values = array_values($array);
+		$values=array_values($array);
 		foreach ($values as $val) {
-			if ($condition($val) === true)
+			if ($condition($val)===true)
 				return $val;
 		}
 		return $result;
 	}
 
-	public static function getDefaultValue($array, $key, $default = NULL) {
+	public static function getDefaultValue($array, $key, $default=NULL) {
 		if (array_key_exists($key, $array)) {
 			return $array[$key];
 		} else
@@ -39,77 +39,77 @@ 
 	}
 
 	public static function implode($glue, $pieces) {
-		$result = "";
+		$result="";
 		if (\is_array($glue)) {
-			$size = \sizeof($pieces);
-			if ($size > 0) {
-				for ($i = 0; $i < $size - 1; $i ++) {
-					$result .= $pieces[$i] . @$glue[$i];
+			$size=\sizeof($pieces);
+			if ($size>0) {
+				for ($i=0; $i<$size-1; $i++) {
+					$result.=$pieces[$i].@$glue[$i];
 				}
-				$result .= $pieces[$size - 1];
+				$result.=$pieces[$size-1];
 			}
 		} else {
-			$result = \implode($glue, $pieces);
+			$result=\implode($glue, $pieces);
 		}
 		return $result;
 	}
 
 	public static function dimension($array) {
 		if (\is_array(reset($array))) {
-			$return = self::dimension(reset($array)) + 1;
+			$return=self::dimension(reset($array))+1;
 		} else {
-			$return = 1;
+			$return=1;
 		}
 		return $return;
 	}
 
-	public static function sortAssociative($array, $sortedKeys = array()) {
-		$newArray = array();
+	public static function sortAssociative($array, $sortedKeys=array()) {
+		$newArray=array();
 		foreach ($sortedKeys as $key) {
 			if (\array_key_exists($key, $array)) {
-				$newArray[$key] = $array[$key];
+				$newArray[$key]=$array[$key];
 			}
 		}
 		return $newArray;
 	}
 
 	public static function moveElementTo(&$array, $from, $to) {
-		$result = false;
+		$result=false;
 		if (isset($array)) {
 			if (isset($array[$from])) {
-				$out = array_splice($array, $from, 1);
+				$out=array_splice($array, $from, 1);
 				array_splice($array, $to, 0, $out);
-				$result = true;
+				$result=true;
 			}
 		}
 		return $result;
 	}
 
 	public static function swapElements(&$array, $index1, $index2) {
-		$result = false;
+		$result=false;
 		if (isset($array)) {
 			if (isset($array[$index1]) && isset($array[$index2])) {
-				$tmp = $array[$index1];
-				$array[$index1] = $array[$index2];
-				$array[$index2] = $tmp;
-				$result = true;
+				$tmp=$array[$index1];
+				$array[$index1]=$array[$index2];
+				$array[$index2]=$tmp;
+				$result=true;
 			}
 		}
 		return $result;
 	}
 
-	public static function modelArray($objects, $identifierFunction = NULL, $modelFunction = NULL) {
-		$result = [];
-		if (isset($modelFunction) === false) {
-			$modelFunction = "__toString";
+	public static function modelArray($objects, $identifierFunction=NULL, $modelFunction=NULL) {
+		$result=[];
+		if (isset($modelFunction)===false) {
+			$modelFunction="__toString";
 		}
-		if (isset($identifierFunction) === false) {
+		if (isset($identifierFunction)===false) {
 			foreach ($objects as $object) {
-				$result[] = self::callFunction($object, $modelFunction);
+				$result[]=self::callFunction($object, $modelFunction);
 			}
 		} else {
 			foreach ($objects as $object) {
-				$result[self::callFunction($object, $identifierFunction)] = self::callFunction($object, $modelFunction);
+				$result[self::callFunction($object, $identifierFunction)]=self::callFunction($object, $modelFunction);
 			}
 		}
 		return $result;
@@ -134,9 +134,9 @@ 
 	}
 
 	public static function removeByKeys($array, $keys) {
-		$assocKeys = [];
+		$assocKeys=[];
 		foreach ($keys as $key) {
-			$assocKeys[$key] = true;
+			$assocKeys[$key]=true;
 		}
 		return \array_diff_key($array, $assocKeys);
 	}

Ajax/common/traits/JsUtilsAjaxTrait.php

Spacing +177 added lines, -177 removed lines

@@ -15,56 +15,56 @@ 
 
 	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);
+	abstract public function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false, $immediatly=true);
 
-	abstract public function interval($jsCode, $time, $globalName = null, $immediatly = true);
+	abstract public function interval($jsCode, $time, $globalName=null, $immediatly=true);
 
-	protected function _ajax($method, $url, $responseElement = "", $parameters = []) {
+	protected function _ajax($method, $url, $responseElement="", $parameters=[]) {
 		if (isset($this->params["ajax"])) {
 			extract($this->params["ajax"]);
 		}
 		extract($parameters);
 
-		$jsCallback = isset($jsCallback) ? $jsCallback : "";
-		$retour = $this->_getAjaxUrl($url, $attr);
-		$originalSelector = $responseElement;
-		$responseElement = $this->_getResponseElement($responseElement);
-		$retour .= "var self=this;\n";
-		$before = isset($before) ? $before : "";
-		$retour .= $before;
-		if ($hasLoader === true && JString::isNotNull($responseElement)) {
+		$jsCallback=isset($jsCallback) ? $jsCallback : "";
+		$retour=$this->_getAjaxUrl($url, $attr);
+		$originalSelector=$responseElement;
+		$responseElement=$this->_getResponseElement($responseElement);
+		$retour.="var self=this;\n";
+		$before=isset($before) ? $before : "";
+		$retour.=$before;
+		if ($hasLoader===true && JString::isNotNull($responseElement)) {
 			$this->addLoading($retour, $responseElement, $ajaxLoader);
-		} elseif ($hasLoader === "internal") {
-			$retour .= "\n$(this).addClass('loading');";
+		} elseif ($hasLoader==="internal") {
+			$retour.="\n$(this).addClass('loading');";
 		}
-		$ajaxParameters = [
+		$ajaxParameters=[
 			"url" => "url",
-			"method" => "'" . \strtoupper($method) . "'"
+			"method" => "'".\strtoupper($method)."'"
 		];
 
-		$ajaxParameters["async"] = ($async ? "true" : "false");
+		$ajaxParameters["async"]=($async ? "true" : "false");
 
 		if (isset($params)) {
-			$ajaxParameters["data"] = self::_correctParams($params, $parameters);
+			$ajaxParameters["data"]=self::_correctParams($params, $parameters);
 		}
 		if (isset($headers)) {
-			$ajaxParameters["headers"] = $headers;
+			$ajaxParameters["headers"]=$headers;
 		}
 		$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.="$.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);
 		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%}",
@@ -72,21 +72,21 @@ 
 		];
 		foreach ($validParameters as $param => $mask) {
 			if (isset($parameters[$param])) {
-				$original[$param] = \str_replace("%value%", $parameters[$param], $mask);
+				$original[$param]=\str_replace("%value%", $parameters[$param], $mask);
 			}
 		}
 	}
 
 	protected function implodeAjaxParameters($ajaxParameters) {
-		$s = '';
+		$s='';
 		foreach ($ajaxParameters as $k => $v) {
-			if ($s !== '') {
-				$s .= ',';
+			if ($s!=='') {
+				$s.=',';
 			}
 			if (is_array($v)) {
-				$s .= "'{$k}':{" . self::implodeAjaxParameters($v) . "}";
+				$s.="'{$k}':{".self::implodeAjaxParameters($v)."}";
 			} else {
-				$s .= "'{$k}':{$v}";
+				$s.="'{$k}':{$v}";
 			}
 		}
 		return $s;
@@ -94,27 +94,27 @@ 
 
 	protected function _addJsCondition($jsCondition, $jsSource) {
 		if (isset($jsCondition)) {
-			return "if(" . $jsCondition . "){\n" . $jsSource . "\n}";
+			return "if(".$jsCondition."){\n".$jsSource."\n}";
 		}
 		return $jsSource;
 	}
 
 	protected function _getAjaxUrl($url, $attr) {
-		$url = $this->_correctAjaxUrl($url);
-		$retour = "url='" . $url . "';";
-		$slash = "/";
-		if (JString::endswith($url, "/") === true) {
-			$slash = "";
+		$url=$this->_correctAjaxUrl($url);
+		$retour="url='".$url."';";
+		$slash="/";
+		if (JString::endswith($url, "/")===true) {
+			$slash="";
 		}
 		if (JString::isNotNull($attr)) {
-			if ($attr === "value") {
-				$retour .= "url=url+'" . $slash . "'+$(this).val();\n";
-			} elseif ($attr === "html") {
-				$retour .= "url=url+'" . $slash . "'+$(this).html();\n";
-			} elseif (\substr($attr, 0, 3) === "js:") {
-				$retour .= "url=url+'" . $slash . "'+" . \substr($attr, 3) . ";\n";
-			} elseif ($attr !== null && $attr !== "")
-				$retour .= "url=url+'" . $slash . "'+($(this).attr('" . $attr . "')||'');\n";
+			if ($attr==="value") {
+				$retour.="url=url+'".$slash."'+$(this).val();\n";
+			} elseif ($attr==="html") {
+				$retour.="url=url+'".$slash."'+$(this).html();\n";
+			} elseif (\substr($attr, 0, 3)==="js:") {
+				$retour.="url=url+'".$slash."'+".\substr($attr, 3).";\n";
+			} elseif ($attr!==null && $attr!=="")
+				$retour.="url=url+'".$slash."'+($(this).attr('".$attr."')||'');\n";
 		}
 		return $retour;
 	}
@@ -123,91 +123,91 @@ 
 		return "window.onpopstate = function(e){if(e.state){var target=e.state.jqueryDone;$(e.state.selector)[target](e.state.html);}};";
 	}
 
-	protected function autoActiveLinks($previousURL = "window.location.href") {
-		$result = "\nfunction getHref(url) { return \$('a').filter(function(){return \$(this).prop('href') == url; });}";
-		$result .= "\nvar myurl={$previousURL};if(window._previousURL) getHref(window._previousURL).removeClass('active');getHref(myurl).addClass('active');window._previousURL=myurl;";
+	protected function autoActiveLinks($previousURL="window.location.href") {
+		$result="\nfunction getHref(url) { return \$('a').filter(function(){return \$(this).prop('href') == url; });}";
+		$result.="\nvar myurl={$previousURL};if(window._previousURL) getHref(window._previousURL).removeClass('active');getHref(myurl).addClass('active');window._previousURL=myurl;";
 		return $result;
 	}
 
-	protected function _getOnAjaxDone($responseElement, $jqueryDone, $ajaxTransition, $jsCallback, $hasLoader = false, $history = null) {
-		$retour = "";
-		$call = null;
+	protected function _getOnAjaxDone($responseElement, $jqueryDone, $ajaxTransition, $jsCallback, $hasLoader=false, $history=null) {
+		$retour="";
+		$call=null;
 		if (JString::isNotNull($responseElement)) {
 			if (isset($ajaxTransition)) {
-				$call = $this->setAjaxDataCall($ajaxTransition);
+				$call=$this->setAjaxDataCall($ajaxTransition);
 			} elseif (isset($this->ajaxTransition)) {
-				$call = $this->ajaxTransition;
+				$call=$this->ajaxTransition;
 			}
 			if (\is_callable($call))
-				$retour = "\t" . $call($responseElement, $jqueryDone) . ";\n";
+				$retour="\t".$call($responseElement, $jqueryDone).";\n";
 			else
-				$retour = "\t{$responseElement}.{$jqueryDone}( data );\n";
+				$retour="\t{$responseElement}.{$jqueryDone}( data );\n";
 		}
 		if (isset($history)) {
 			if ($this->params["autoActiveLinks"]) {
-				$retour .= $this->autoActiveLinks("url");
+				$retour.=$this->autoActiveLinks("url");
 			}
-			$retour .= "\nwindow.history.pushState({'html':data,'selector':" . Javascript::prep_value($history) . ",'jqueryDone':'{$jqueryDone}'},'', url);";
+			$retour.="\nwindow.history.pushState({'html':data,'selector':".Javascript::prep_value($history).",'jqueryDone':'{$jqueryDone}'},'', url);";
 		}
-		if ($hasLoader === "internal") {
-			$retour .= "\n$(self).removeClass('loading');";
+		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);
+			$responseElement=Javascript::prep_jquery_selector($responseElement);
 		}
 		return $responseElement;
 	}
 
 	protected function _correctAjaxUrl($url) {
-		if ($url !== "/" && JString::endsWith($url, "/") === true)
-			$url = substr($url, 0, strlen($url) - 1);
-		if (strncmp($url, 'http://', 7) != 0 && strncmp($url, 'https://', 8) != 0) {
-			$url = $this->getUrl($url);
+		if ($url!=="/" && JString::endsWith($url, "/")===true)
+			$url=substr($url, 0, strlen($url)-1);
+		if (strncmp($url, 'http://', 7)!=0 && strncmp($url, 'https://', 8)!=0) {
+			$url=$this->getUrl($url);
 		}
 		return $url;
 	}
 
-	public static function _correctParams($params, $ajaxParameters = []) {
+	public static function _correctParams($params, $ajaxParameters=[]) {
 		if (JString::isNull($params)) {
 			return "";
 		}
 		if (\preg_match("@^\{.*?\}$@", $params)) {
-			if (! isset($ajaxParameters['contentType']) || ! JString::contains($ajaxParameters['contentType'], 'json')) {
-				return '$.param(' . $params . ')';
+			if (!isset($ajaxParameters['contentType']) || !JString::contains($ajaxParameters['contentType'], 'json')) {
+				return '$.param('.$params.')';
 			} else {
-				return 'JSON.stringify(' . $params . ')';
+				return 'JSON.stringify('.$params.')';
 			}
 		}
 		return $params;
 	}
 
 	public static function _implodeParams($parameters) {
-		$allParameters = [];
+		$allParameters=[];
 		foreach ($parameters as $params) {
 			if (isset($params))
-				$allParameters[] = self::_correctParams($params);
+				$allParameters[]=self::_correctParams($params);
 		}
 		return \implode("+'&'+", $allParameters);
 	}
 
-	protected function addLoading(&$retour, $responseElement, $ajaxLoader = null) {
-		if (! isset($ajaxLoader)) {
-			$ajaxLoader = $this->ajaxLoader;
+	protected function addLoading(&$retour, $responseElement, $ajaxLoader=null) {
+		if (!isset($ajaxLoader)) {
+			$ajaxLoader=$this->ajaxLoader;
 		}
-		$loading_notifier = '<div class="ajax-loader">' . $ajaxLoader . '</div>';
-		$retour .= "{$responseElement}.empty();\n";
-		$retour .= "\t\t{$responseElement}.prepend('{$loading_notifier}');\n";
+		$loading_notifier='<div class="ajax-loader">'.$ajaxLoader.'</div>';
+		$retour.="{$responseElement}.empty();\n";
+		$retour.="\t\t{$responseElement}.prepend('{$loading_notifier}');\n";
 	}
 
 	protected function setAjaxDataCall($params) {
-		$result = null;
-		if (! \is_callable($params)) {
-			$result = function ($responseElement, $jqueryDone = "html") use ($params) {
+		$result=null;
+		if (!\is_callable($params)) {
+			$result=function($responseElement, $jqueryDone="html") use ($params) {
 				return AjaxTransition::{$params}($responseElement, $jqueryDone);
 			};
 		}
@@ -216,13 +216,13 @@ 
 
 	protected function setDefaultParameters(&$parameters, $default) {
 		foreach ($default as $k => $v) {
-			if (! isset($parameters[$k]))
-				$parameters[$k] = $v;
+			if (!isset($parameters[$k]))
+				$parameters[$k]=$v;
 		}
 	}
 
 	public function setAjaxLoader($loader) {
-		$this->ajaxLoader = $loader;
+		$this->ajaxLoader=$loader;
 	}
 
 	/**
@@ -233,7 +233,7 @@ 
 	 * @param string $responseElement
 	 *        	selector of the HTML element displaying the answer
 	 */
-	private function _get($url, $responseElement = "", $parameters = []) {
+	private function _get($url, $responseElement="", $parameters=[]) {
 		return $this->_ajax("get", $url, $responseElement, $parameters);
 	}
 
@@ -247,8 +247,8 @@ 
 	 * @param array $parameters
 	 *        	default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null,"historize"=>false)
 	 */
-	public function get($url, $responseElement = "", $parameters = []) {
-		$parameters["immediatly"] = true;
+	public function get($url, $responseElement="", $parameters=[]) {
+		$parameters["immediatly"]=true;
 		return $this->_get($url, $responseElement, $parameters);
 	}
 
@@ -264,8 +264,8 @@ 
 	 * @param array $parameters
 	 *        	default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null,"historize"=>false)
 	 */
-	public function ajax($method, $url, $responseElement = "", $parameters = []) {
-		$parameters["immediatly"] = true;
+	public function ajax($method, $url, $responseElement="", $parameters=[]) {
+		$parameters["immediatly"]=true;
 		return $this->_ajax($method, $url, $responseElement, $parameters);
 	}
 
@@ -285,7 +285,7 @@ 
 	 *        	The ajax parameters, default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null,"historize"=>false)
 	 * @return string
 	 */
-	public function ajaxInterval($method, $url, $interval, $globalName = null, $responseElement = "", $parameters = []) {
+	public function ajaxInterval($method, $url, $interval, $globalName=null, $responseElement="", $parameters=[]) {
 		return $this->interval($this->ajaxDeferred($method, $url, $responseElement, $parameters), $interval, $globalName);
 	}
 
@@ -301,8 +301,8 @@ 
 	 * @param array $parameters
 	 *        	default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null,"historize"=>false)
 	 */
-	public function ajaxDeferred($method, $url, $responseElement = "", $parameters = []) {
-		$parameters["immediatly"] = false;
+	public function ajaxDeferred($method, $url, $responseElement="", $parameters=[]) {
+		$parameters["immediatly"]=false;
 		return $this->_ajax($method, $url, $responseElement, $parameters);
 	}
 
@@ -316,15 +316,15 @@ 
 	 * @param array $parameters
 	 *        	default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","context"=>"document","jsCondition"=>NULL,"headers"=>null,"immediatly"=>false)
 	 */
-	private function _json($url, $method = "get", $parameters = []) {
-		$parameters = \array_merge($parameters, [
+	private function _json($url, $method="get", $parameters=[]) {
+		$parameters=\array_merge($parameters, [
 			"hasLoader" => false
 		]);
-		$jsCallback = isset($parameters['jsCallback']) ? $parameters['jsCallback'] : "";
-		$context = isset($parameters['context']) ? $parameters['context'] : "document";
-		$retour = "\tdata=($.isPlainObject(data))?data:JSON.parse(data);\t" . $jsCallback . ";" . "\n\tfor(var key in data){" . "if($('#'+key," . $context . ").length){ if($('#'+key," . $context . ").is('[value]')) { $('#'+key," . $context . ").val(data[key]);} else { $('#'+key," . $context . ").html(data[key]); }}};\n";
-		$retour .= "\t$(document).trigger('jsonReady',[data]);\n";
-		$parameters["jsCallback"] = $retour;
+		$jsCallback=isset($parameters['jsCallback']) ? $parameters['jsCallback'] : "";
+		$context=isset($parameters['context']) ? $parameters['context'] : "document";
+		$retour="\tdata=($.isPlainObject(data))?data:JSON.parse(data);\t".$jsCallback.";"."\n\tfor(var key in data){"."if($('#'+key,".$context.").length){ if($('#'+key,".$context.").is('[value]')) { $('#'+key,".$context.").val(data[key]);} else { $('#'+key,".$context.").html(data[key]); }}};\n";
+		$retour.="\t$(document).trigger('jsonReady',[data]);\n";
+		$parameters["jsCallback"]=$retour;
 		return $this->_ajax($method, $url, null, $parameters);
 	}
 
@@ -338,7 +338,7 @@ 
 	 * @param array $parameters
 	 *        	default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","context"=>"document","jsCondition"=>NULL,"headers"=>null,"immediatly"=>false)
 	 */
-	public function json($url, $method = "get", $parameters = []) {
+	public function json($url, $method="get", $parameters=[]) {
 		return $this->_json($url, $method, $parameters);
 	}
 
@@ -354,7 +354,7 @@ 
 	 * @param array $parameters
 	 *        	default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","params"=>"{}","method"=>"get","immediatly"=>true)
 	 */
-	public function jsonOn($event, $element, $url, $method = "get", $parameters = array()) {
+	public function jsonOn($event, $element, $url, $method="get", $parameters=array()) {
 		$this->setDefaultParameters($parameters, [
 			"preventDefault" => true,
 			"stopPropagation" => true,
@@ -373,8 +373,8 @@ 
 	 * @param array $parameters
 	 *        	default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","context"=>"document","jsCondition"=>NULL,"headers"=>null,"immediatly"=>false)
 	 */
-	public function jsonDeferred($url, $method = "get", $parameters = []) {
-		$parameters["immediatly"] = false;
+	public function jsonDeferred($url, $method="get", $parameters=[]) {
+		$parameters["immediatly"]=false;
 		return $this->_json($url, $method, $parameters);
 	}
 
@@ -389,29 +389,29 @@ 
 	 * @param array $parameters
 	 *        	default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","context"=>null,"jsCondition"=>NULL,"headers"=>null,"immediatly"=>false,"rowClass"=>"_json")
 	 */
-	private function _jsonArray($maskSelector, $url, $method = "get", $parameters = []) {
-		$parameters = \array_merge($parameters, [
+	private function _jsonArray($maskSelector, $url, $method="get", $parameters=[]) {
+		$parameters=\array_merge($parameters, [
 			"hasLoader" => false
 		]);
-		$rowClass = isset($parameters['rowClass']) ? $parameters['rowClass'] : "_json";
-		$jsCallback = isset($parameters['jsCallback']) ? $parameters['jsCallback'] : "";
-		$context = isset($parameters['context']) ? $parameters['context'] : null;
-		if ($context === null) {
-			$parent = "$('" . $maskSelector . "').parent()";
-			$newElm = "$('#'+newId)";
+		$rowClass=isset($parameters['rowClass']) ? $parameters['rowClass'] : "_json";
+		$jsCallback=isset($parameters['jsCallback']) ? $parameters['jsCallback'] : "";
+		$context=isset($parameters['context']) ? $parameters['context'] : null;
+		if ($context===null) {
+			$parent="$('".$maskSelector."').parent()";
+			$newElm="$('#'+newId)";
 		} else {
-			$parent = $context;
-			$newElm = $context . ".find('#'+newId)";
+			$parent=$context;
+			$newElm=$context.".find('#'+newId)";
 		}
-		$appendTo = "\t\tnewElm.appendTo(" . $parent . ");\n";
-		$retour = $parent . ".find('.{$rowClass}').remove();";
-		$retour .= "\tdata=($.isPlainObject(data)||$.isArray(data))?data:JSON.parse(data);\n$.each(data, function(index, value) {\n" . "\tvar created=false;var maskElm=$('" . $maskSelector . "').first();maskElm.hide();" . "\tvar newId=(maskElm.attr('id') || 'mask')+'-'+index;" . "\tvar newElm=" . $newElm . ";\n" . "\tif(!newElm.length){\n" . "\t\tnewElm=maskElm.clone();
+		$appendTo="\t\tnewElm.appendTo(".$parent.");\n";
+		$retour=$parent.".find('.{$rowClass}').remove();";
+		$retour.="\tdata=($.isPlainObject(data)||$.isArray(data))?data:JSON.parse(data);\n$.each(data, function(index, value) {\n"."\tvar created=false;var maskElm=$('".$maskSelector."').first();maskElm.hide();"."\tvar newId=(maskElm.attr('id') || 'mask')+'-'+index;"."\tvar newElm=".$newElm.";\n"."\tif(!newElm.length){\n"."\t\tnewElm=maskElm.clone();
 		newElm.attr('id',newId);\n;newElm.addClass('{$rowClass}').removeClass('_jsonArrayModel');\nnewElm.find('[id]').each(function(){ var newId=$(this).attr('id')+'-'+index;$(this).attr('id',newId).removeClass('_jsonArrayChecked');});\n";
-		$retour .= $appendTo;
-		$retour .= "\t}\n" . "\tfor(var key in value){\n" . "\t\t\tvar html = $('<div />').append($(newElm).clone()).html();\n" . "\t\t\tif(html.indexOf('__'+key+'__')>-1){\n" . "\t\t\t\tcontent=$(html.split('__'+key+'__').join(value[key]));\n" . "\t\t\t\t$(newElm).replaceWith(content);newElm=content;\n" . "\t\t\t}\n" . "\t\tvar sel='[data-id=\"'+key+'\"]';if($(sel,newElm).length){\n" . "\t\t\tvar selElm=$(sel,newElm);\n" . "\t\t\t if(selElm.is('[value]')) { selElm.attr('value',value[key]);selElm.val(value[key]);} else { selElm.html(value[key]); }\n" . "\t\t}\n" . "}\n" . "\t$(newElm).show(true);" . "\n" . "\t$(newElm).removeClass('hide');" . "});\n";
-		$retour .= "\t$(document).trigger('jsonReady',[data]);\n";
-		$retour .= "\t" . $jsCallback;
-		$parameters["jsCallback"] = $retour;
+		$retour.=$appendTo;
+		$retour.="\t}\n"."\tfor(var key in value){\n"."\t\t\tvar html = $('<div />').append($(newElm).clone()).html();\n"."\t\t\tif(html.indexOf('__'+key+'__')>-1){\n"."\t\t\t\tcontent=$(html.split('__'+key+'__').join(value[key]));\n"."\t\t\t\t$(newElm).replaceWith(content);newElm=content;\n"."\t\t\t}\n"."\t\tvar sel='[data-id=\"'+key+'\"]';if($(sel,newElm).length){\n"."\t\t\tvar selElm=$(sel,newElm);\n"."\t\t\t if(selElm.is('[value]')) { selElm.attr('value',value[key]);selElm.val(value[key]);} else { selElm.html(value[key]); }\n"."\t\t}\n"."}\n"."\t$(newElm).show(true);"."\n"."\t$(newElm).removeClass('hide');"."});\n";
+		$retour.="\t$(document).trigger('jsonReady',[data]);\n";
+		$retour.="\t".$jsCallback;
+		$parameters["jsCallback"]=$retour;
 		return $this->_ajax($method, $url, null, $parameters);
 	}
 
@@ -426,7 +426,7 @@ 
 	 * @param array $parameters
 	 *        	default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","context"=>null,"jsCondition"=>NULL,"headers"=>null,"immediatly"=>false,"rowClass"=>"_json")
 	 */
-	public function jsonArray($maskSelector, $url, $method = "get", $parameters = []) {
+	public function jsonArray($maskSelector, $url, $method="get", $parameters=[]) {
 		return $this->_jsonArray($maskSelector, $url, $method, $parameters);
 	}
 
@@ -441,8 +441,8 @@ 
 	 * @param array $parameters
 	 *        	default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","context"=>null,"jsCondition"=>NULL,"headers"=>null,"rowClass"=>"_json")
 	 */
-	public function jsonArrayDeferred($maskSelector, $url, $method = "get", $parameters) {
-		$parameters["immediatly"] = false;
+	public function jsonArrayDeferred($maskSelector, $url, $method="get", $parameters) {
+		$parameters["immediatly"]=false;
 		return $this->jsonArray($maskSelector, $url, $method, $parameters);
 	}
 
@@ -458,7 +458,7 @@ 
 	 * @param array $parameters
 	 *        	default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","params"=>"{}","method"=>"get","rowClass"=>"_json","immediatly"=>true)
 	 */
-	public function jsonArrayOn($event, $element, $maskSelector, $url, $method = "get", $parameters = array()) {
+	public function jsonArrayOn($event, $element, $maskSelector, $url, $method="get", $parameters=array()) {
 		$this->setDefaultParameters($parameters, [
 			"preventDefault" => true,
 			"stopPropagation" => true,
@@ -478,8 +478,8 @@ 
 	 * @param array $parameters
 	 *        	default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null,"historize"=>false)
 	 */
-	public function getDeferred($url, $responseElement = "", $parameters = []) {
-		$parameters["immediatly"] = false;
+	public function getDeferred($url, $responseElement="", $parameters=[]) {
+		$parameters["immediatly"]=false;
 		return $this->_get($url, $responseElement, $parameters);
 	}
 
@@ -498,7 +498,7 @@ 
 	 * @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)
 	 */
-	public function getOn($event, $element, $url, $responseElement = "", $parameters = array()) {
+	public function getOn($event, $element, $url, $responseElement="", $parameters=array()) {
 		$this->setDefaultParameters($parameters, [
 			"preventDefault" => true,
 			"stopPropagation" => true,
@@ -522,7 +522,7 @@ 
 	 * @param array $parameters
 	 *        	default : array("method"=>"get","preventDefault"=>true,"stopPropagation"=>true,"params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","jsCondition"=>NULL,"headers"=>null,"historize"=>false)
 	 */
-	public function ajaxOn($event, $element, $url, $responseElement = "", $parameters = array()) {
+	public function ajaxOn($event, $element, $url, $responseElement="", $parameters=array()) {
 		$this->setDefaultParameters($parameters, [
 			"preventDefault" => true,
 			"stopPropagation" => true,
@@ -545,7 +545,7 @@ 
 	 * @param array $parameters
 	 *        	default : array("method"=>"get","preventDefault"=>true,"stopPropagation"=>true,"params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","jsCondition"=>NULL,"headers"=>null,"historize"=>false)
 	 */
-	public function ajaxOnClick($element, $url, $responseElement = "", $parameters = array()) {
+	public function ajaxOnClick($element, $url, $responseElement="", $parameters=array()) {
 		return $this->ajaxOn("click", $element, $url, $responseElement, $parameters);
 	}
 
@@ -562,7 +562,7 @@ 
 	 * @param array $parameters
 	 *        	default : array("preventDefault"=>true,"stopPropagation"=>true,"params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","jsCondition"=>NULL,"headers"=>null,"historize"=>false)
 	 */
-	public function getOnClick($element, $url, $responseElement = "", $parameters = array()) {
+	public function getOnClick($element, $url, $responseElement="", $parameters=array()) {
 		return $this->getOn("click", $element, $url, $responseElement, $parameters);
 	}
 
@@ -577,15 +577,15 @@ 
 	 *        	default : array("preventDefault"=>true,"stopPropagation"=>true,"params"=>"{}","jsCallback"=>NULL,"attr"=>"href","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","jsCondition"=>NULL,"headers"=>null,"historize"=>true)
 	 * @return $this
 	 */
-	public function getHref($element, $responseElement = "", $parameters = array()) {
-		$parameters["attr"] = "href";
+	public function getHref($element, $responseElement="", $parameters=array()) {
+		$parameters["attr"]="href";
 		if (JString::isNull($responseElement)) {
-			$responseElement = '%$(self).attr("data-target")%';
+			$responseElement='%$(self).attr("data-target")%';
 		} else {
-			$responseElement = '%$(self).attr("data-target") || "' . $responseElement . '"%';
+			$responseElement='%$(self).attr("data-target") || "'.$responseElement.'"%';
 		}
-		if (! isset($parameters["historize"])) {
-			$parameters["historize"] = true;
+		if (!isset($parameters["historize"])) {
+			$parameters["historize"]=true;
 		}
 		return $this->getOnClick($element, "", $responseElement, $parameters);
 	}
@@ -601,21 +601,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)
 	 * @return $this
 	 */
-	public function postHref($element, $responseElement = "", $parameters = array()) {
-		$parameters["attr"] = "href";
+	public function postHref($element, $responseElement="", $parameters=array()) {
+		$parameters["attr"]="href";
 		if (JString::isNull($responseElement)) {
-			$responseElement = '%$(this).attr("data-target")%';
+			$responseElement='%$(this).attr("data-target")%';
 		} else {
-			$responseElement = '%$(self).attr("data-target") || "' . $responseElement . '"%';
+			$responseElement='%$(self).attr("data-target") || "'.$responseElement.'"%';
 		}
-		if (! isset($parameters["historize"])) {
-			$parameters["historize"] = true;
+		if (!isset($parameters["historize"])) {
+			$parameters["historize"]=true;
 		}
 		return $this->postOnClick($element, "", "{}", $responseElement, $parameters);
 	}
 
-	private function _post($url, $params = "{}", $responseElement = "", $parameters = []) {
-		$parameters["params"] = $params;
+	private function _post($url, $params="{}", $responseElement="", $parameters=[]) {
+		$parameters["params"]=$params;
 		return $this->_ajax("POST", $url, $responseElement, $parameters);
 	}
 
@@ -631,7 +631,7 @@ 
 	 * @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)
 	 */
-	public function post($url, $params = "{}", $responseElement = "", $parameters = []) {
+	public function post($url, $params="{}", $responseElement="", $parameters=[]) {
 		return $this->_post($url, $params, $responseElement, $parameters);
 	}
 
@@ -648,8 +648,8 @@ 
 	 * @param array $parameters
 	 *        	default : array("jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null,"historize"=>false)
 	 */
-	public function postDeferred($url, $params = "{}", $responseElement = "", $parameters = []) {
-		$parameters["immediatly"] = false;
+	public function postDeferred($url, $params="{}", $responseElement="", $parameters=[]) {
+		$parameters["immediatly"]=false;
 		return $this->_post($url, $params, $responseElement, $parameters);
 	}
 
@@ -668,7 +668,7 @@ 
 	 * @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)
 	 */
-	public function postOn($event, $element, $url, $params = "{}", $responseElement = "", $parameters = array()) {
+	public function postOn($event, $element, $url, $params="{}", $responseElement="", $parameters=array()) {
 		$this->setDefaultParameters($parameters, [
 			"preventDefault" => true,
 			"stopPropagation" => true,
@@ -691,54 +691,54 @@ 
 	 * @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)
 	 */
-	public function postOnClick($element, $url, $params = "{}", $responseElement = "", $parameters = array()) {
+	public function postOnClick($element, $url, $params="{}", $responseElement="", $parameters=array()) {
 		return $this->postOn("click", $element, $url, $params, $responseElement, $parameters);
 	}
 
-	private function _postForm($url, $form, $responseElement, $parameters = []) {
+	private function _postForm($url, $form, $responseElement, $parameters=[]) {
 		if (isset($this->params["ajax"])) {
 			extract($this->params["ajax"]);
 		}
-		$params = "{}";
-		$validation = false;
+		$params="{}";
+		$validation=false;
 		\extract($parameters);
-		$async = ($async) ? "true" : "false";
-		$jsCallback = isset($jsCallback) ? $jsCallback : "";
-		$retour = $this->_getAjaxUrl($url, $attr);
-		$retour .= "\n$('#" . $form . "').trigger('ajaxSubmit');";
-		$retour .= "\nvar params=$('#" . $form . "').serialize();\n";
+		$async=($async) ? "true" : "false";
+		$jsCallback=isset($jsCallback) ? $jsCallback : "";
+		$retour=$this->_getAjaxUrl($url, $attr);
+		$retour.="\n$('#".$form."').trigger('ajaxSubmit');";
+		$retour.="\nvar params=$('#".$form."').serialize();\n";
 		if (isset($params)) {
-			$retour .= "params+='&'+" . self::_correctParams($params) . ";\n";
+			$retour.="params+='&'+".self::_correctParams($params).";\n";
 		}
-		$responseElement = $this->_getResponseElement($responseElement);
-		$retour .= "var self=this;\n";
-		if ($hasLoader === true) {
+		$responseElement=$this->_getResponseElement($responseElement);
+		$retour.="var self=this;\n";
+		if ($hasLoader===true) {
 			$this->addLoading($retour, $responseElement, $ajaxLoader);
-		} elseif ($hasLoader === "internal") {
-			$retour .= "\n$(this).addClass('loading');";
+		} elseif ($hasLoader==="internal") {
+			$retour.="\n$(this).addClass('loading');";
 		}
-		$ajaxParameters = [
+		$ajaxParameters=[
 			"url" => "url",
 			"method" => "'POST'",
 			"data" => "params",
 			"async" => $async
 		];
 		if (isset($headers)) {
-			$ajaxParameters["headers"] = $headers;
+			$ajaxParameters["headers"]=$headers;
 		}
 		$this->createAjaxParameters($ajaxParameters, $parameters);
-		$retour .= "$.ajax({" . $this->implodeAjaxParameters($ajaxParameters) . "}).done(function( data ) {\n";
-		$retour .= $this->_getOnAjaxDone($responseElement, $jqueryDone, $ajaxTransition, $jsCallback, $hasLoader) . "});\n";
+		$retour.="$.ajax({".$this->implodeAjaxParameters($ajaxParameters)."}).done(function( data ) {\n";
+		$retour.=$this->_getOnAjaxDone($responseElement, $jqueryDone, $ajaxTransition, $jsCallback, $hasLoader)."});\n";
 
 		if ($validation) {
-			$retour = "$('#" . $form . "').validate({submitHandler: function(form) {
-			" . $retour . "
+			$retour="$('#".$form."').validate({submitHandler: function(form) {
+			" . $retour."
 			}});\n";
-			$retour .= "$('#" . $form . "').submit();\n";
+			$retour.="$('#".$form."').submit();\n";
 		}
-		$retour = $this->_addJsCondition($jsCondition, $retour);
+		$retour=$this->_addJsCondition($jsCondition, $retour);
 		if ($immediatly)
-			$this->jquery_code_for_compile[] = $retour;
+			$this->jquery_code_for_compile[]=$retour;
 		return $retour;
 	}
 
@@ -754,8 +754,8 @@ 
 	 * @param array $parameters
 	 *        	default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null,"historize"=>false)
 	 */
-	public function postForm($url, $form, $responseElement, $parameters = []) {
-		$parameters["immediatly"] = true;
+	public function postForm($url, $form, $responseElement, $parameters=[]) {
+		$parameters["immediatly"]=true;
 		return $this->_postForm($url, $form, $responseElement, $parameters);
 	}
 
@@ -772,8 +772,8 @@ 
 	 * @param array $parameters
 	 *        	default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null,"historize"=>false)
 	 */
-	public function postFormDeferred($url, $form, $responseElement, $parameters = []) {
-		$parameters["immediatly"] = false;
+	public function postFormDeferred($url, $form, $responseElement, $parameters=[]) {
+		$parameters["immediatly"]=false;
 		return $this->_postForm($url, $form, $responseElement, $parameters);
 	}
 
@@ -790,7 +790,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)
 	 */
-	public function postFormOn($event, $element, $url, $form, $responseElement = "", $parameters = array()) {
+	public function postFormOn($event, $element, $url, $form, $responseElement="", $parameters=array()) {
 		$this->setDefaultParameters($parameters, [
 			"preventDefault" => true,
 			"stopPropagation" => true,
@@ -811,7 +811,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)
 	 */
-	public function postFormOnClick($element, $url, $form, $responseElement = "", $parameters = array()) {
+	public function postFormOnClick($element, $url, $form, $responseElement="", $parameters=array()) {
 		return $this->postFormOn("click", $element, $url, $form, $responseElement, $parameters);
 	}
 }

Ajax/semantic/html/elements/HtmlButton.php

Spacing +40 added lines, -40 removed lines

@@ -30,9 +30,9 @@ 
 	 * @param string $onClick
 	 *        	JS Code for click event
 	 */
-	public function __construct($identifier, $value = null, $cssStyle = null, $onClick = null) {
+	public function __construct($identifier, $value=null, $cssStyle=null, $onClick=null) {
 		parent::__construct($identifier, "button", "ui button");
-		$this->content = $value;
+		$this->content=$value;
 		if (isset($cssStyle)) {
 			$this->setStyle($cssStyle);
 		}
@@ -51,12 +51,12 @@ 
 		if (is_array($this->content)) {
 			foreach ($this->content as $i => $content) {
 				if (is_string($content)) {
-					$this->content[$i] = $value;
+					$this->content[$i]=$value;
 					return $this;
 				}
 			}
 		}
-		$this->content = $value;
+		$this->content=$value;
 		return $this;
 	}
 
@@ -70,8 +70,8 @@ 
 		return $this->addToProperty("class", $cssStyle);
 	}
 
-	public function setFocusable($value = true) {
-		if ($value === true)
+	public function setFocusable($value=true) {
+		if ($value===true)
 			$this->setProperty("tabindex", "0");
 		else {
 			$this->removeProperty("tabindex");
@@ -79,16 +79,16 @@ 
 		return $this;
 	}
 
-	public function setAnimated($content, $animation = "") {
+	public function setAnimated($content, $animation="") {
 		$this->setTagName("div");
-		$this->addToProperty("class", "animated " . $animation);
-		$visible = new HtmlSemDoubleElement("visible-" . $this->identifier, "div");
+		$this->addToProperty("class", "animated ".$animation);
+		$visible=new HtmlSemDoubleElement("visible-".$this->identifier, "div");
 		$visible->setClass("visible content");
 		$visible->setContent($this->content);
-		$hidden = new HtmlSemDoubleElement("hidden-" . $this->identifier, "div");
+		$hidden=new HtmlSemDoubleElement("hidden-".$this->identifier, "div");
 		$hidden->setClass("hidden content");
 		$hidden->setContent($content);
-		$this->content = array(
+		$this->content=array(
 			$visible,
 			$hidden
 		);
@@ -101,12 +101,12 @@ 
 	 * @return HtmlButton
 	 */
 	public function asIcon($icon) {
-		$iconO = $icon;
+		$iconO=$icon;
 		if (\is_string($icon)) {
-			$iconO = new HtmlIcon("icon-" . $this->identifier, $icon);
+			$iconO=new HtmlIcon("icon-".$this->identifier, $icon);
 		}
 		$this->addToProperty("class", "icon");
-		$this->content = $iconO;
+		$this->content=$iconO;
 		return $this;
 	}
 
@@ -123,19 +123,19 @@ 
 	 * @param string $icon
 	 * @return HtmlLabel
 	 */
-	public function addLabel($label, $before = false, $icon = NULL) {
-		$this->tagName = "div";
-		$prefix = "";
+	public function addLabel($label, $before=false, $icon=NULL) {
+		$this->tagName="div";
+		$prefix="";
 		if ($before)
-			$prefix = "left ";
-		$this->addToProperty("class", $prefix . "labeled");
-		$isIcon = (isset($this->content[0]) && $this->content[0] instanceof HtmlIcon);
-		$this->content = new HtmlButton("button-" . $this->identifier, $this->content);
+			$prefix="left ";
+		$this->addToProperty("class", $prefix."labeled");
+		$isIcon=(isset($this->content[0]) && $this->content[0] instanceof HtmlIcon);
+		$this->content=new HtmlButton("button-".$this->identifier, $this->content);
 		if ($isIcon) {
 			$this->content->addClass("icon");
 		}
 		$this->content->setTagName("div");
-		$label = new HtmlLabel("label-" . $this->identifier, $label, $icon, "a");
+		$label=new HtmlLabel("label-".$this->identifier, $label, $icon, "a");
 		$label->setBasic();
 		$this->addContent($label, $before);
 		return $label;
@@ -146,7 +146,7 @@ 
 	 * @see \Ajax\common\html\BaseHtml::fromArray()
 	 */
 	public function fromArray($array) {
-		$array = parent::fromArray($array);
+		$array=parent::fromArray($array);
 		foreach ($array as $key => $value) {
 			$this->setProperty($key, $value);
 		}
@@ -187,9 +187,9 @@ 
 	 *
 	 * @return HtmlButton
 	 */
-	public function setToggle($active = "") {
-		$this->onCreate("$('#" . $this->identifier . "').state();");
-		return $this->addToProperty("class", "toggle " . $active);
+	public function setToggle($active="") {
+		$this->onCreate("$('#".$this->identifier."').state();");
+		return $this->addToProperty("class", "toggle ".$active);
 	}
 
 	/**
@@ -225,10 +225,10 @@ 
 	 * @param string $value
 	 * @return HtmlButton
 	 */
-	public static function social($identifier, $social, $value = NULL) {
-		if ($value === NULL)
-			$value = \ucfirst($social);
-		$return = new HtmlButton($identifier, $value);
+	public static function social($identifier, $social, $value=NULL) {
+		if ($value===NULL)
+			$value=\ucfirst($social);
+		$return=new HtmlButton($identifier, $value);
 		$return->addIcon($social);
 		return $return->addToPropertyCtrl("class", $social, Social::getConstants());
 	}
@@ -242,8 +242,8 @@ 
 	 * @param boolean $before
 	 * @return \Ajax\semantic\html\elements\HtmlButton
 	 */
-	public static function labeled($identifier, $value, $icon, $before = true) {
-		$result = new HtmlButton($identifier, $value);
+	public static function labeled($identifier, $value, $icon, $before=true) {
+		$result=new HtmlButton($identifier, $value);
 		$result->addIcon($icon, $before, true);
 		return $result;
 	}
@@ -256,7 +256,7 @@ 
 	 * @return HtmlButton
 	 */
 	public static function icon($identifier, $icon) {
-		$result = new HtmlButton($identifier);
+		$result=new HtmlButton($identifier);
 		$result->asIcon($icon);
 		return $result;
 	}
@@ -266,7 +266,7 @@ 
 	 * {@inheritdoc}
 	 * @see HtmlSemDoubleElement::asLink()
 	 */
-	public function asLink($href = NULL, $target = NULL) {
+	public function asLink($href=NULL, $target=NULL) {
 		parent::asLink($href, $target);
 		return $this;
 	}
@@ -281,20 +281,20 @@ 
 	 * @param string $icon
 	 * @return HtmlButtonGroups
 	 */
-	public static function dropdown($identifier, $value, $items = [], $asCombo = false, $icon = null) {
-		$result = new HtmlButtonGroups($identifier, [
+	public static function dropdown($identifier, $value, $items=[], $asCombo=false, $icon=null) {
+		$result=new HtmlButtonGroups($identifier, [
 			$value
 		]);
-		$dd = $result->addDropdown($items, $asCombo);
+		$dd=$result->addDropdown($items, $asCombo);
 		if (isset($icon) && $dd instanceof HtmlDropdown)
 			$dd->setIcon($icon);
 		return $result;
 	}
 
-	public function addPopupConfirmation($message, $buttons = ["Okay","Cancel"]) {
-		$elm = new HtmlSemDoubleElement('popup-confirm-' . $this->_identifier);
+	public function addPopupConfirmation($message, $buttons=["Okay", "Cancel"]) {
+		$elm=new HtmlSemDoubleElement('popup-confirm-'.$this->_identifier);
 		$elm->setContent([
-			'message' => new HtmlSemDoubleElement('popup-confirm-message-' . $this->_identifier, 'p', '', $message)
+			'message' => new HtmlSemDoubleElement('popup-confirm-message-'.$this->_identifier, 'p', '', $message)
 		]);
 		$this->addPopupHtml($elm, null, [
 			'on' => 'click'

Ajax/semantic/html/collections/menus/HtmlMenu.php

Spacing +31 added lines, -31 removed lines

@@ -41,12 +41,12 @@ 
 	 * @return HtmlMenu
 	 */
 	public function setType($type="") {
-		return $this->addToPropertyCtrl("class", $type, array ("","item","text" ));
+		return $this->addToPropertyCtrl("class", $type, array("", "item", "text"));
 	}
 
 	public function setActiveItem($index) {
 		$item=$this->getItem($index);
-		if ($item !== null) {
+		if ($item!==null) {
 			$item->addToProperty("class", "active");
 		}
 		return $this;
@@ -54,7 +54,7 @@ 
 
 	private function getItemToInsert($item) {
 		if ($item instanceof HtmlInput || $item instanceof HtmlImg || $item instanceof HtmlIcon || $item instanceof HtmlButtonGroups || $item instanceof HtmlButton || $item instanceof HtmlLabel) {
-			$itemO=new HtmlMenuItem("item-" . $this->identifier . "-" . \sizeof($this->content) , $item);
+			$itemO=new HtmlMenuItem("item-".$this->identifier."-".\sizeof($this->content), $item);
 			$itemO->addClass("no-active");
 			$item=$itemO;
 		}
@@ -63,7 +63,7 @@ 
 
 	private function afterInsert($item) {
 		if (!$item instanceof HtmlMenu && $item->propertyContains("class", "header")===false)
-			$item->addToPropertyCtrl("class", "item", array ("item" ));
+			$item->addToPropertyCtrl("class", "item", array("item"));
 		else {
 			$this->setSecondary();
 		}
@@ -79,7 +79,7 @@ 
 	public function addItem($item) {
 		$number=$item;
 		$item=parent::addItem($this->getItemToInsert($item));
-		if(\is_int($number))
+		if (\is_int($number))
 			$item->setProperty("data-page", $number);
 		return $this->afterInsert($item);
 	}
@@ -97,15 +97,15 @@ 
 
 	public function generateMenuAsItem($menu, $header=null) {
 		$count=$this->count();
-		$item=new HtmlSemDoubleElement("item-" . $this->identifier . "-" . $count, "div");
+		$item=new HtmlSemDoubleElement("item-".$this->identifier."-".$count, "div");
 		if (isset($header)) {
-			$headerItem=new HtmlSemDoubleElement("item-header-" . $this->identifier . "-" . $count, "div", "header");
+			$headerItem=new HtmlSemDoubleElement("item-header-".$this->identifier."-".$count, "div", "header");
 			$headerItem->setContent($header);
 			$item->addContent($headerItem);
 			$this->_itemHeader=$headerItem;
 		}
-		if(\is_array($menu)){
-			$menu=new HtmlMenu("menu-" . $this->identifier . "-" . $count,$menu);
+		if (\is_array($menu)) {
+			$menu=new HtmlMenu("menu-".$this->identifier."-".$count, $menu);
 		}
 		$menu->setClass("menu");
 		$item->addContent($menu);
@@ -117,11 +117,11 @@ 
 	 * @param String|HtmlDoubleElement $caption
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
-	public function addHeader($caption){
-		if(!($caption instanceof HtmlDoubleElement)){
-			$header=new HtmlDoubleElement('','div');
+	public function addHeader($caption) {
+		if (!($caption instanceof HtmlDoubleElement)) {
+			$header=new HtmlDoubleElement('', 'div');
 			$header->setContent($caption);
-		}else{
+		} else {
 			$header=$caption;
 		}
 		$header->addClass('item header');
@@ -137,7 +137,7 @@ 
 		$value=new HtmlSemDoubleElement($identifier, "a", "browse item", $value);
 		$value->addContent(new HtmlIcon("", "dropdown"));
 		$value=$this->addItem($value);
-		$popup=new HtmlPopup($value, "popup-" . $this->identifier . "-" . $this->count(), $content);
+		$popup=new HtmlPopup($value, "popup-".$this->identifier."-".$this->count(), $content);
 		$popup->setFlowing()->setPosition("bottom left")->setOn("click");
 		$this->wrap("", $popup);
 		return $popup;
@@ -146,7 +146,7 @@ 
 	public function addDropdownAsItem($value, $items=NULL) {
 		$dd=$value;
 		if (\is_string($value)) {
-			$dd=new HtmlDropdown("dropdown-" . $this->identifier . "-" . $this->count(), $value, $items);
+			$dd=new HtmlDropdown("dropdown-".$this->identifier."-".$this->count(), $value, $items);
 		}
 		$this->addItem($dd);
 		return $dd;
@@ -159,14 +159,14 @@ 
 	 * @see HtmlCollection::createItem()
 	 */
 	protected function createItem($value) {
-		$itemO=new HtmlMenuItem($this->identifier."-item-" . \sizeof($this->content),"");
+		$itemO=new HtmlMenuItem($this->identifier."-item-".\sizeof($this->content), "");
 		$itemO->setTagName("a");
 		$itemO->setContent($value);
 		return $itemO;
 	}
 
 	public function setSecondary($value=true) {
-		if($value)
+		if ($value)
 			$this->addToProperty("class", "secondary");
 		else
 			$this->removePropertyValue("class", "secondary");
@@ -174,28 +174,28 @@ 
 	}
 
 	public function setVertical() {
-		return $this->addToPropertyCtrl("class", "vertical", array ("vertical" ));
+		return $this->addToPropertyCtrl("class", "vertical", array("vertical"));
 	}
 
 	public function setPosition($value="right") {
-		return $this->addToPropertyCtrl("class", $value, array ("right","left" ));
+		return $this->addToPropertyCtrl("class", $value, array("right", "left"));
 	}
 
 	public function setPointing($value=Direction::NONE) {
-		return $this->addToPropertyCtrl("class", $value . " pointing", Direction::getConstantValues("pointing"));
+		return $this->addToPropertyCtrl("class", $value." pointing", Direction::getConstantValues("pointing"));
 	}
 
 	public function asTab($vertical=false) {
-		$this->apply(function (HtmlDoubleElement &$item) {
+		$this->apply(function(HtmlDoubleElement &$item) {
 			$item->setTagName("a");
 		});
-		if ($vertical === true)
+		if ($vertical===true)
 			$this->setVertical();
 		return $this->addToProperty("class", "tabular");
 	}
 
 	public function asPagination() {
-		$this->apply(function (HtmlDoubleElement &$item) {
+		$this->apply(function(HtmlDoubleElement &$item) {
 			$item->setTagName("a");
 		});
 		return $this->addToProperty("class", "pagination");
@@ -232,10 +232,10 @@ 
 	 */
 	public function setWidth($width) {
 		if (\is_int($width)) {
-			$width=Wide::getConstants()["W" . $width];
+			$width=Wide::getConstants()["W".$width];
 		}
 		$this->addToPropertyCtrl("class", $width, Wide::getConstants());
-		return $this->addToPropertyCtrl("class", "item", array ("item" ));
+		return $this->addToPropertyCtrl("class", "item", array("item"));
 	}
 
 	public function addImage($identifier, $src="", $alt="") {
@@ -250,14 +250,14 @@ 
 		return $this->_itemHeader;
 	}
 
-	public function setHasContainer(){
-		return $this->wrapContent("<div class='ui container'>","</div>");
+	public function setHasContainer() {
+		return $this->wrapContent("<div class='ui container'>", "</div>");
 	}
 
-	public function run(JsUtils $js){
-		if($this->identifier!=="" && !isset($this->_bsComponent))
-			$this->onClick('if(!$(this).hasClass("dropdown")&&!$(this).hasClass("no-active")){$(this).addClass("active").siblings().removeClass("active");}',false,false);
-		$result= parent::run($js);
+	public function run(JsUtils $js) {
+		if ($this->identifier!=="" && !isset($this->_bsComponent))
+			$this->onClick('if(!$(this).hasClass("dropdown")&&!$(this).hasClass("no-active")){$(this).addClass("active").siblings().removeClass("active");}', false, false);
+		$result=parent::run($js);
 		return $result->setItemSelector(">.item:not(.header)");
 	}
 }

Ajax/bootstrap/html/HtmlModal.php

Spacing +10 added lines, -10 removed lines

@@ -14,7 +14,7 @@ 
 class HtmlModal extends BaseHtml {
 	protected $title="HtmlModal Title";
 	protected $content="";
-	protected $buttons=array ();
+	protected $buttons=array();
 	protected $showOnStartup=false;
 	protected $draggable=false;
 	protected $validCondition=NULL;
@@ -27,10 +27,10 @@ 
 	public function __construct($identifier, $title="", $content="", $buttonCaptions=array()) {
 		parent::__construct($identifier);
 		$this->_template=include 'templates/tplModal.php';
-		$this->buttons=array ();
+		$this->buttons=array();
 		$this->title=$title;
 		$this->content=$content;
-		foreach ( $buttonCaptions as $button ) {
+		foreach ($buttonCaptions as $button) {
 			$this->addButton($button);
 		}
 	}
@@ -65,7 +65,7 @@ 
 	 * @param string $value
 	 * @return HtmlButton
 	 */
-	public function addOkayButton($value="Okay",$jsCode="") {
+	public function addOkayButton($value="Okay", $jsCode="") {
 		$btn=$this->addButton($value, "btn-primary");
 		$btn->onClick("if(".$this->getValidCondition()."){ ".$jsCode."$('#".$this->identifier."').modal('hide');}");
 		return $btn;
@@ -114,8 +114,8 @@ 
 	 * @param string $viewName
 	 * @param array $params The parameters to pass to the view
 	 */
-	public function renderView(JsUtils $js,$initialController,$viewName, $params=array()) {
-		$this->content=$js->renderContent($initialController, $viewName,$params);
+	public function renderView(JsUtils $js, $initialController, $viewName, $params=array()) {
+		$this->content=$js->renderContent($initialController, $viewName, $params);
 	}
 
 	/**
@@ -126,8 +126,8 @@ 
 	 * @param string $actionName the action name
 	 * @param array $params
 	 */
-	public function forward(JsUtils $js,$initialControllerInstance,$controllerName,$actionName,$params=NULL){
-		$this->content=$js->forward($initialControllerInstance, $controllerName, $actionName,$params);
+	public function forward(JsUtils $js, $initialControllerInstance, $controllerName, $actionName, $params=NULL) {
+		$this->content=$js->forward($initialControllerInstance, $controllerName, $actionName, $params);
 	}
 
 	/*
@@ -135,10 +135,10 @@ 
 	 * @see BaseHtml::run()
 	 */
 	public function run(JsUtils $js) {
-		if($this->content instanceof BaseHtml){
+		if ($this->content instanceof BaseHtml) {
 			$this->content->run($js);
 		}
-		$this->_bsComponent=$js->bootstrap()->modal("#".$this->identifier, array (
+		$this->_bsComponent=$js->bootstrap()->modal("#".$this->identifier, array(
 				"show" => $this->showOnStartup
 		));
 		if ($this->draggable)

Ajax/semantic/widgets/base/FieldAsTrait.php

Spacing +128 added lines, -128 removed lines

@@ -32,23 +32,23 @@ 
  * @property mixed $_modelInstance
  * @property boolean $_hasRules
  */
-trait FieldAsTrait{
+trait FieldAsTrait {
 
-	abstract protected function _getFieldIdentifier($prefix,$name="");
-	abstract public function setValueFunction($index,$callback);
+	abstract protected function _getFieldIdentifier($prefix, $name="");
+	abstract public function setValueFunction($index, $callback);
 	abstract protected function _getFieldName($index);
 	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){
-		if(isset($attributes["jsCallback"])){
+	protected function _applyAttributes(BaseHtml $element, &$attributes, $index, $instance=null) {
+		if (isset($attributes["jsCallback"])) {
 			$callback=$attributes["jsCallback"];
-			if(\is_callable($callback)){
-				$callback($element,$instance,$index,InstanceViewer::$index);
+			if (\is_callable($callback)) {
+				$callback($element, $instance, $index, InstanceViewer::$index);
 			}
 		}
 		unset($attributes["rules"]);
@@ -57,44 +57,44 @@ 
 		$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"])){
+	protected function _addRules(HtmlFormField $element, &$attributes) {
+		if (isset($attributes["rules"])) {
 			$this->_hasRules=true;
 			$rules=$attributes["rules"];
-			if(\is_array($rules)){
+			if (\is_array($rules)) {
 				$element->addRules($rules);
 			}
-			else{
+			else {
 				$element->addRule($rules);
 			}
 			unset($attributes["rules"]);
 		}
 	}
 
-	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){
+	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"])){
+			$id=$this->_getFieldIdentifier($prefix, $name);
+			if (isset($attributes["name"])) {
 				$name=$attributes["name"];
 				unset($attributes["name"]);
 			}
-			$element=$elementCallback($id,$name,$value,$caption);
-			if(\is_array($attributes)){
-				$this->_applyAttributes($element, $attributes,$index,$instance);
+			$element=$elementCallback($id, $name, $value, $caption);
+			if (\is_array($attributes)) {
+				$this->_applyAttributes($element, $attributes, $index, $instance);
 			}
 			$element->setDisabled(!$this->_edition);
 			return $element;
@@ -103,216 +103,216 @@ 
 	}
 
 
-	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);
-			if(isset($icon))
+	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");
+		}, $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);
-			if(isset($icon))
+	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");
+		}, $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);$image->setSize($size);if($circular)$image->setCircular();
+	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();
 			return $image;
 		});
 			return $this;
 	}
 
-	public function fieldAsFlag($index){
-		$this->setValueFunction($index,function($flag){
-			$flag=new HtmlFlag($this->_getFieldIdentifier("flag"),$flag);
+	public function fieldAsFlag($index) {
+		$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);
+	public function fieldAsIcon($index) {
+		$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");
+		}, $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");
+		}, $index, $attributes, "radio");
 	}
 
-	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 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");
+		}, $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");
+		}, $index, $attributes, "input");
 	}
 	
-	public function fieldAsFile($index,$attributes=NULL){
-		if(isset($this->_form)){
-			$this->_form->setProperty('enctype','multipart/form-data');
+	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");
+		}, $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");
+		}, $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");
+		}, $index, $attributes, "element");
 	}
 
 
-	public function fieldAsHidden($index,$attributes=NULL){
-		if(!\is_array($attributes)){
+	public function fieldAsHidden($index, $attributes=NULL) {
+		if (!\is_array($attributes)) {
 			$attributes=[];
 		}
 		$attributes["inputType"]="hidden";
 		$attributes["style"]="display:none;";
-		return $this->fieldAsInput($index,$attributes);
+		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==="")
+	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=new HtmlFormCheckbox($id, $caption, $this->_instanceViewer->getIdentifier());
 			$input->setChecked(JString::isBooleanTrue($value));
 			return $this->_prepareFormFields($input, $name, $attributes);
-		}, $index,$attributes,"ck");
+		}, $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);
-			$dd->asSelect($name,$multiple);
+	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");
+		}, $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");
+		}, $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");
+		}, $index, $attributes, "link");
 	}
 
 	/**Change fields type
 	 * @param array $types an array or associative array $type=>$attributes
 	 */
-	public function fieldsAs(array $types){
+	public function fieldsAs(array $types) {
 		$i=0;
-		if(JArray::isAssociative($types)){
-			foreach ($types as $type=>$attributes){
-				if(\is_int($type))
-					$this->fieldAs($i++,$attributes,[]);
-				else{
-					$type=preg_replace('/\d/', '', $type );
-					$this->fieldAs($i++,$type,$attributes);
+		if (JArray::isAssociative($types)) {
+			foreach ($types as $type=>$attributes) {
+				if (\is_int($type))
+					$this->fieldAs($i++, $attributes, []);
+				else {
+					$type=preg_replace('/\d/', '', $type);
+					$this->fieldAs($i++, $type, $attributes);
 				}
 			}
-		}else{
-			foreach ($types as $type){
-				$this->fieldAs($i++,$type);
+		} else {
+			foreach ($types as $type) {
+				$this->fieldAs($i++, $type);
 			}
 		}
 	}
 
-	public function fieldAs($index,$type,$attributes=NULL){
+	public function fieldAs($index, $type, $attributes=NULL) {
 		$method="fieldAs".\ucfirst($type);
-		if(\method_exists($this, $method)){
-			if(!\is_array($attributes)){
+		if (\method_exists($this, $method)) {
+			if (!\is_array($attributes)) {
 				$attributes=[$index];
-			}else{
+			} else {
 				\array_unshift($attributes, $index);
 			}
-			\call_user_func_array([$this,$method], $attributes);
+			\call_user_func_array([$this, $method], $attributes);
 		}
 	}
 
-	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"]);
+	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");
+		}, $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");
+		}, $index, $attributes, "button");
 	}
 }

Ajax/semantic/html/elements/HtmlInput.php

Spacing +10 added lines, -10 removed lines

@@ -12,15 +12,15 @@ 
 use Ajax\service\Javascript;
 
 class HtmlInput extends HtmlSemDoubleElement {
-	use IconTrait,TextFieldsTrait,FieldTrait;
+	use IconTrait, TextFieldsTrait, FieldTrait;
 
 	public function __construct($identifier, $type="text", $value="", $placeholder="") {
-		parent::__construct("div-" . $identifier, "div", "ui input");
+		parent::__construct("div-".$identifier, "div", "ui input");
 		$this->_identifier=$identifier;
 		$this->_libraryId=$identifier;
-		$this->content=[ "field" => new HtmlInput5($identifier, $type, $value, $placeholder) ];
-		$this->_states=[ State::DISABLED,State::FOCUS,State::ERROR ];
-		$this->_variations=[ Variation::TRANSPARENT ];
+		$this->content=["field" => new HtmlInput5($identifier, $type, $value, $placeholder)];
+		$this->_states=[State::DISABLED, State::FOCUS, State::ERROR];
+		$this->_variations=[Variation::TRANSPARENT];
 	}
 
 	public function getField() {
@@ -40,17 +40,17 @@ 
 
 	public function run(JsUtils $js) {
 		$result=parent::run($js);
-		$result->attach("#" . $this->getDataField()->getIdentifier());
+		$result->attach("#".$this->getDataField()->getIdentifier());
 		return $result;
 	}
 
-	public function setTransparent(){
+	public function setTransparent() {
 		return $this->addToProperty("class", "transparent");
 	}
 	
-	public function compile_once(\Ajax\JsUtils $js = NULL, &$view = NULL){
-		parent::compile_once($js,$view);
-		if(isset($this->content['file'])){
+	public function compile_once(\Ajax\JsUtils $js=NULL, &$view=NULL) {
+		parent::compile_once($js, $view);
+		if (isset($this->content['file'])) {
 			$this->onCreate(Javascript::fileUploadBehavior($this->identifier));
 		}
 	}

Ajax/semantic/html/collections/form/traits/FieldTrait.php

Spacing +29 added lines, -29 removed lines

@@ -21,7 +21,7 @@ 
 
 	abstract public function addToProperty($name, $value, $separator=" ");
 	abstract public function addLabel($caption, $style="label-default", $leftSeparator=" ");
-	abstract public function addContent($content,$before=false);
+	abstract public function addContent($content, $before=false);
 	abstract public function getField();
 	abstract public function getDataField();
 
@@ -30,7 +30,7 @@ 
 	}
 
 	public function addLoading() {
-		if ($this->_hasIcon === false) {
+		if ($this->_hasIcon===false) {
 			throw new \Exception("Input must have an icon for showing a loader, use addIcon before");
 		}
 		return $this->addToProperty("class", State::LOADING);
@@ -44,8 +44,8 @@ 
 	 */
 	public function labeled($label, $direction=Direction::LEFT, $icon=NULL) {
 		$field=$this->getField();
-		$labelO=$field->addLabel($label,$direction===Direction::LEFT,$icon);
-		$field->addToProperty("class", $direction . " labeled");
+		$labelO=$field->addLabel($label, $direction===Direction::LEFT, $icon);
+		$field->addToProperty("class", $direction." labeled");
 		return $labelO;
 	}
 
@@ -56,8 +56,8 @@ 
 	 * @param string $checkboxType
 	 * @return HtmlLabel
 	 */
-	public function labeledCheckbox($direction=Direction::LEFT,$caption="",$value=NULL,$checkboxType=NULL){
-		return $this->labeled(new HtmlCheckbox("lbl-ck-".$this->getField()->getIdentifier(),$caption,$value,$checkboxType),$direction);
+	public function labeledCheckbox($direction=Direction::LEFT, $caption="", $value=NULL, $checkboxType=NULL) {
+		return $this->labeled(new HtmlCheckbox("lbl-ck-".$this->getField()->getIdentifier(), $caption, $value, $checkboxType), $direction);
 	}
 
 	/**
@@ -66,7 +66,7 @@ 
 	 * @return HtmlLabel
 	 */
 	public function labeledToCorner($icon, $direction=Direction::LEFT) {
-		return $this->labeled("", $direction . " corner", $icon)->toCorner($direction);
+		return $this->labeled("", $direction." corner", $icon)->toCorner($direction);
 	}
 
 	/**
@@ -79,13 +79,13 @@ 
 	public function addAction($action, $direction=Direction::RIGHT, $icon=NULL, $labeled=false) {
 		$field=$this->getField();
 		$actionO=$action;
-		if (\is_object($action) === false) {
-			$actionO=new HtmlButton("action-" . $this->identifier, $action);
+		if (\is_object($action)===false) {
+			$actionO=new HtmlButton("action-".$this->identifier, $action);
 			if (isset($icon))
 				$actionO->addIcon($icon, true, $labeled);
 		}
-		$field->addToProperty("class", $direction . " action");
-		$field->addContent($actionO, \strstr($direction, Direction::LEFT) !== false);
+		$field->addToProperty("class", $direction." action");
+		$field->addContent($actionO, \strstr($direction, Direction::LEFT)!==false);
 		return $actionO;
 	}
 
@@ -95,59 +95,59 @@ 
 	 * @param string $direction
 	 * @return HtmlLabel
 	 */
-	public function addDropdown($label="", $items=array(),$direction=Direction::RIGHT){
-		$labelO=new HtmlDropdown("dd-".$this->identifier,$label,$items);
-		$labelO->asSelect("select-".$this->identifier,false,true);
-		return $this->labeled($labelO,$direction);
+	public function addDropdown($label="", $items=array(), $direction=Direction::RIGHT) {
+		$labelO=new HtmlDropdown("dd-".$this->identifier, $label, $items);
+		$labelO->asSelect("select-".$this->identifier, false, true);
+		return $this->labeled($labelO, $direction);
 	}
 
 	public function setTransparent() {
 		return $this->getField()->addToProperty("class", "transparent");
 	}
 
-	public function setReadonly(){
+	public function setReadonly() {
 		$this->getDataField()->setProperty("readonly", "");
 		return $this;
 	}
 
-	public function setName($name){
-		$this->getDataField()->setProperty("name",$name);
+	public function setName($name) {
+		$this->getDataField()->setProperty("name", $name);
 		return $this;
 	}
 
-	public function setFluid(){
-		$this->getField()->addToProperty("class","fluid");
+	public function setFluid() {
+		$this->getField()->addToProperty("class", "fluid");
 		return $this;
 	}
 
 	public function setDisabled($disable=true) {
 		$field=$this->getField();
-		if($disable)
+		if ($disable)
 			$field->addToProperty("class", "disabled");
 		return $this;
 	}
 	
-	public function setJsContent($content){
+	public function setJsContent($content) {
 		$id="";
 		$field=$this->getDataField();
-		if(isset($field)){
+		if (isset($field)) {
 			$id=$field->getIdentifier();
 		}
-		if($id!==''){
+		if ($id!=='') {
 			return '$("#'.$id.'").val('.$content.')';
 		}
 	}
 	
-	public function getJsContent(){
+	public function getJsContent() {
 		return $this->setJsContent("");
 	}
 	
-	public function asFile($caption='', $direction=Direction::RIGHT, $icon='cloud upload alternate', $labeled=false){
+	public function asFile($caption='', $direction=Direction::RIGHT, $icon='cloud upload alternate', $labeled=false) {
 		$field=$this->getField();
 		$field->getDataField()->setProperty('readonly', 'readonly');
-		$file=new HtmlInput5($this->identifier.'-file','file');
-		$file->setProperty('style','display: none!important;');
+		$file=new HtmlInput5($this->identifier.'-file', 'file');
+		$file->setProperty('style', 'display: none!important;');
 		$field->getField()->content['file']=$file;
-		$this->addAction($caption,$direction,$icon,$labeled);
+		$this->addAction($caption, $direction, $icon, $labeled);
 	}
 }