phpMv / phpMv-UI

Ajax/common/html/BaseWidget.php

Spacing +2 added lines, -2 removed lines

@@ -37,7 +37,7 @@ 
 	 * @return mixed
 	 */
 	public function getLibraryId() {
-		if( isset($this->_libraryId)){
+		if (isset($this->_libraryId)) {
 			return $this->_libraryId;
 		}
 		return $this->identifier;
@@ -47,7 +47,7 @@ 
 	 * @param mixed $_libraryId
 	 */
 	public function setLibraryId($_libraryId) {
-		$this->_libraryId = $_libraryId;
+		$this->_libraryId=$_libraryId;
 	}
 
 }

Ajax/common/html/BaseHtml.php

Spacing +59 added lines, -59 removed lines

@@ -15,11 +15,11 @@ 
  * @version 1.3
  */
 abstract class BaseHtml extends BaseWidget {
-	use BaseHtmlEventsTrait,BaseHtmlPropertiesTrait;
+	use BaseHtmlEventsTrait, BaseHtmlPropertiesTrait;
 	protected $_template;
 	protected $tagName;
-	protected $_wrapBefore=array ();
-	protected $_wrapAfter=array ();
+	protected $_wrapBefore=array();
+	protected $_wrapAfter=array();
 	protected $_bsComponent;
 	protected $_compiled=false;
 	protected $_runned=false;
@@ -33,32 +33,32 @@ 
 	 */
 	abstract public function run(JsUtils $js);
 
-	private function _callSetter($setter,$key,$value,&$array){
+	private function _callSetter($setter, $key, $value, &$array) {
 		$result=false;
-		if (method_exists($this, $setter) && substr($setter, 0, 1) !== "_") {
+		if (method_exists($this, $setter) && substr($setter, 0, 1)!=="_") {
 			try {
 				$this->$setter($value);
 				unset($array[$key]);
 				$result=true;
-			} catch ( \Exception $e ) {
+			}catch (\Exception $e) {
 				$result=false;
 			}
 		}
 		return $result;
 	}
 
-	protected function getTemplate(JsUtils $js=NULL,$view=null) {
-		return PropertyWrapper::wrap($this->_wrapBefore, $js,$view) . $this->_template . PropertyWrapper::wrap($this->_wrapAfter, $js,$view);
+	protected function getTemplate(JsUtils $js=NULL, $view=null) {
+		return PropertyWrapper::wrap($this->_wrapBefore, $js, $view).$this->_template.PropertyWrapper::wrap($this->_wrapAfter, $js, $view);
 	}
 
 	protected function ctrl($name, $value, $typeCtrl) {
 		if (\is_array($typeCtrl)) {
-			if (array_search($value, $typeCtrl) === false) {
-				throw new \Exception("La valeur passée `" . $value . "` à la propriété `" . $name . "` ne fait pas partie des valeurs possibles : {" . implode(",", $typeCtrl) . "}");
+			if (array_search($value, $typeCtrl)===false) {
+				throw new \Exception("La valeur passée `".$value."` à la propriété `".$name."` ne fait pas partie des valeurs possibles : {".implode(",", $typeCtrl)."}");
 			}
 		} else {
 			if (!$typeCtrl($value)) {
-				throw new \Exception("La fonction " . $typeCtrl . " a retourné faux pour l'affectation de la propriété " . $name);
+				throw new \Exception("La fonction ".$typeCtrl." a retourné faux pour l'affectation de la propriété ".$name);
 			}
 		}
 		return true;
@@ -75,7 +75,7 @@ 
 	protected function addToMemberUnique(&$name, $value, $typeCtrl, $separator=" ") {
 		if (\is_array($typeCtrl)) {
 			$this->removeOldValues($name, $typeCtrl);
-			$name.=$separator . $value;
+			$name.=$separator.$value;
 		}
 		return $this;
 	}
@@ -87,12 +87,12 @@ 
 		if (\is_array($typeCtrl)) {
 			$this->removeOldValues($name, $typeCtrl);
 		}
-		$name.=$separator . $value;
+		$name.=$separator.$value;
 		return $this;
 	}
 
 	protected function addToMember(&$name, $value, $separator=" ") {
-		$name=str_ireplace($value, "", $name) . $separator . $value;
+		$name=str_ireplace($value, "", $name).$separator.$value;
 		return $this;
 	}
 
@@ -103,18 +103,18 @@ 
 		$oldValue=trim($oldValue);
 	}
 
-	protected function _getElementBy($callback,$elements){
+	protected function _getElementBy($callback, $elements) {
 		if (\is_array($elements)) {
 			$elements=\array_values($elements);
 			$flag=false;
 			$index=0;
-			while ( !$flag && $index < sizeof($elements) ) {
+			while (!$flag && $index<sizeof($elements)) {
 				if ($elements[$index] instanceof BaseHtml)
 					$flag=($callback($elements[$index]));
 					$index++;
 			}
-			if ($flag === true)
-				return $elements[$index - 1];
+			if ($flag===true)
+				return $elements[$index-1];
 		} elseif ($elements instanceof BaseHtml) {
 			if ($callback($elements))
 				return $elements;
@@ -142,13 +142,13 @@ 
 	}
 
 	public function fromArray($array) {
-		foreach ( $this as $key => $value ) {
-			if(array_key_exists($key, $array)===true)
-				$this->_callSetter("set" . ucfirst($key), $key, $array[$key], $array);
+		foreach ($this as $key => $value) {
+			if (array_key_exists($key, $array)===true)
+				$this->_callSetter("set".ucfirst($key), $key, $array[$key], $array);
 		}
-		foreach ( $array as $key => $value ) {
-			if($this->_callSetter($key, $key, $value, $array)===false){
-				$this->_callSetter("set" . ucfirst($key), $key, $value, $array);
+		foreach ($array as $key => $value) {
+			if ($this->_callSetter($key, $key, $value, $array)===false) {
+				$this->_callSetter("set".ucfirst($key), $key, $value, $array);
 			}
 		}
 		return $array;
@@ -156,7 +156,7 @@ 
 
 	public function fromDatabaseObjects($objects, $function) {
 		if (isset($objects)) {
-			foreach ( $objects as $object ) {
+			foreach ($objects as $object) {
 				$this->fromDatabaseObject($object, $function);
 			}
 		}
@@ -177,7 +177,7 @@ 
 
 
 	public function getElementById($identifier, $elements) {
-		return $this->_getElementBy(function(BaseWidget $element) use ($identifier){return $element->getIdentifier()===$identifier;}, $elements);
+		return $this->_getElementBy(function(BaseWidget $element) use ($identifier){return $element->getIdentifier()===$identifier; }, $elements);
 	}
 
 	public function getBsComponent() {
@@ -190,11 +190,11 @@ 
 	}
 
 	protected function compile_once(JsUtils $js=NULL, &$view=NULL) {
-		if(!$this->_compiled){
-			if(isset($js)){
+		if (!$this->_compiled) {
+			if (isset($js)) {
 				$beforeCompile=$js->getParam("beforeCompileHtml");
-				if(\is_callable($beforeCompile)){
-					$beforeCompile($this,$js,$view);
+				if (\is_callable($beforeCompile)) {
+					$beforeCompile($this, $js, $view);
 				}
 			}
 			$this->callCallback($this->_preCompile);
@@ -204,17 +204,17 @@ 
 	}
 
 	public function compile(JsUtils $js=NULL, &$view=NULL) {
-		$this->compile_once($js,$view);
-		$result=$this->getTemplate($js,$view);
-		foreach ( $this as $key => $value ) {
-				if(\strstr($result, "%{$key}%")!==false){
+		$this->compile_once($js, $view);
+		$result=$this->getTemplate($js, $view);
+		foreach ($this as $key => $value) {
+				if (\strstr($result, "%{$key}%")!==false) {
 					if (\is_array($value)) {
-						$v=PropertyWrapper::wrap($value, $js,$view);
-					}elseif($value instanceof \stdClass){
-							$v=\print_r($value,true);
-					}elseif ($value instanceof BaseHtml){
-						$v=$value->compile($js,$view);
-					}else{
+						$v=PropertyWrapper::wrap($value, $js, $view);
+					}elseif ($value instanceof \stdClass) {
+							$v=\print_r($value, true);
+					}elseif ($value instanceof BaseHtml) {
+						$v=$value->compile($js, $view);
+					} else {
 						$v=$value;
 					}
 					$result=str_replace("%{$key}%", $v, $result);
@@ -222,12 +222,12 @@ 
 		}
 		if (isset($js)===true) {
 			$this->run($js);
-			if (isset($view) === true) {
+			if (isset($view)===true) {
 				$js->addViewElement($this->getLibraryId(), $result, $view);
 			}
 		}
 
-		if(\is_callable($this->_postCompile)){
+		if (\is_callable($this->_postCompile)) {
 			$pc=$this->_postCompile;
 			$pc($this);
 		}
@@ -241,13 +241,13 @@ 
 	 * @param array $parameters default: ["jsCallback"=>"","jqueryDone"=>"append"]
 	 * @return \Ajax\common\html\BaseHtml
 	 */
-	public function setDraggable($attr="id",$dropZone=null,$parameters=[]){
+	public function setDraggable($attr="id", $dropZone=null, $parameters=[]) {
 		$this->setProperty("draggable", "true");
-		$this->addEvent("dragstart",Javascript::draggable($attr));
-		if(isset($dropZone)&& $dropZone instanceof BaseHtml){
-			$jqueryDone="append";$jsCallback="";
+		$this->addEvent("dragstart", Javascript::draggable($attr));
+		if (isset($dropZone) && $dropZone instanceof BaseHtml) {
+			$jqueryDone="append"; $jsCallback="";
 			extract($parameters);
-			$dropZone->asDropZone($jsCallback,$jqueryDone,$parameters);
+			$dropZone->asDropZone($jsCallback, $jqueryDone, $parameters);
 		}
 		return $this;
 	}
@@ -259,11 +259,11 @@ 
 	 * @param array $parameters
 	 * @return \Ajax\common\html\BaseHtml
 	 */
-	public function asDropZone($jsCallback="",$jqueryDone="append",$parameters=[]){
+	public function asDropZone($jsCallback="", $jqueryDone="append", $parameters=[]) {
 		$stopPropagation=false;
-		$this->addEvent("dragover", '', $stopPropagation,true);
+		$this->addEvent("dragover", '', $stopPropagation, true);
 		extract($parameters);
-		$this->addEvent("drop",Javascript::dropZone($jqueryDone,$jsCallback),$stopPropagation,true);
+		$this->addEvent("drop", Javascript::dropZone($jqueryDone, $jsCallback), $stopPropagation, true);
 		return $this;
 	}
 
@@ -271,17 +271,17 @@ 
 		return $this->compile();
 	}
 
-	public function onPostCompile($callback){
+	public function onPostCompile($callback) {
 		$this->_postCompile=$callback;
 	}
 
-	public function onPreCompile($callback){
+	public function onPreCompile($callback) {
 		$this->_preCompile=$this->addCallback($this->_preCompile, $callback);
 	}
 	
-	private function addCallback($originalValue,$callback){
-		if(isset($originalValue)){
-			if(!is_array($originalValue)){
+	private function addCallback($originalValue, $callback) {
+		if (isset($originalValue)) {
+			if (!is_array($originalValue)) {
 				$result=[$originalValue];
 			}
 			$result[]=$callback;
@@ -290,12 +290,12 @@ 
 		return $callback;
 	}
 	
-	private function callCallback($callable){
-		if(\is_callable($callable)){
+	private function callCallback($callable) {
+		if (\is_callable($callable)) {
 			return $callable($this);
 		}
-		if(is_array($callable)){
-			foreach ($callable as $call){
+		if (is_array($callable)) {
+			foreach ($callable as $call) {
 				$this->callCallback($call);
 			}
 		}

Ajax/semantic/html/collections/form/HtmlForm.php

Spacing +30 added lines, -30 removed lines

@@ -23,7 +23,7 @@ 
  */
 class HtmlForm extends HtmlSemCollection {
 
-	use FieldsTrait,FormTrait;
+	use FieldsTrait, FormTrait;
 	/**
 	 * @var array
 	 */
@@ -38,15 +38,15 @@ 
 
 	public function __construct($identifier, $elements=array()) {
 		parent::__construct($identifier, "form", "ui form");
-		$this->_states=[ State::ERROR,State::SUCCESS,State::WARNING,State::DISABLED ];
+		$this->_states=[State::ERROR, State::SUCCESS, State::WARNING, State::DISABLED];
 		$this->setProperty("name", $this->identifier);
-		$this->_fields=array ();
+		$this->_fields=array();
 		$this->addItems($elements);
 		$this->_validationParams=[];
 		$this->_extraFieldRules=[];
 	}
 
-	protected function getForm(){
+	protected function getForm() {
 		return $this;
 	}
 
@@ -68,8 +68,8 @@ 
 	 * @param string $caption
 	 * @return HtmlForm
 	 */
-	public function addDivider($caption=NULL){
-		return $this->addContent(new HtmlDivider("",$caption));
+	public function addDivider($caption=NULL) {
+		return $this->addContent(new HtmlDivider("", $caption));
 	}
 
 	/**
@@ -91,13 +91,13 @@ 
 						$label=NULL;
 				}
 				$this->_fields=\array_merge($this->_fields, $fields);
-				$fields=new HtmlFormFields("fields-" . $this->identifier . "-" . $this->count(), $fields);
+				$fields=new HtmlFormFields("fields-".$this->identifier."-".$this->count(), $fields);
 			}
-			if (isset($label)){
-				$fields->wrap("<div class='field'><label>{$label}</label>","</div>");
+			if (isset($label)) {
+				$fields->wrap("<div class='field'><label>{$label}</label>", "</div>");
 			}
 		} else {
-			$fields=new HtmlFormFields("fields-" . $this->identifier . "-" . $this->count());
+			$fields=new HtmlFormFields("fields-".$this->identifier."-".$this->count());
 		}
 		$this->addItem($fields);
 		return $fields;
@@ -105,7 +105,7 @@ 
 
 	public function addItem($item) {
 		$item=parent::addItem($item);
-		if (\is_subclass_of($item, HtmlFormField::class) === true) {
+		if (\is_subclass_of($item, HtmlFormField::class)===true) {
 			$this->_fields[]=$item;
 		}
 		return $item;
@@ -163,49 +163,49 @@ 
 
 
 
-	public function compile(JsUtils $js=NULL,&$view=NULL){
-		if(\sizeof($this->_validationParams)>0)
+	public function compile(JsUtils $js=NULL, &$view=NULL) {
+		if (\sizeof($this->_validationParams)>0)
 			$this->setProperty("novalidate", "");
-		return parent::compile($js,$view);
+		return parent::compile($js, $view);
 	}
 
 	public function run(JsUtils $js) {
-		if(isset($js)){
+		if (isset($js)) {
 			$compo=$js->semantic()->form("#".$this->identifier);
-		}else{
+		} else {
 			$compo=new Form();
 			$compo->attach("#".$this->identifier);
 		}
-		foreach ($this->_fields as $field){
-			if($field instanceof HtmlFormField){
+		foreach ($this->_fields as $field) {
+			if ($field instanceof HtmlFormField) {
 				$compo=$this->addCompoValidation($compo, $field);
 			}
 		}
-		foreach ($this->content as $field){
-			if($field instanceof HtmlFormFields){
+		foreach ($this->content as $field) {
+			if ($field instanceof HtmlFormFields) {
 				$items=$field->getItems();
-				foreach ($items as $_field){
-					if($_field instanceof HtmlFormField)
+				foreach ($items as $_field) {
+					if ($_field instanceof HtmlFormField)
 						$compo=$this->addCompoValidation($compo, $_field);
 				}
 			}
 		}
-		foreach ($this->_extraFieldRules as $field=>$fieldValidation){
+		foreach ($this->_extraFieldRules as $field=>$fieldValidation) {
 			$compo=$this->addExtraCompoValidation($compo, $fieldValidation);
 		}
-		$this->_runValidationParams($compo,$js);
+		$this->_runValidationParams($compo, $js);
 		return $this->_bsComponent;
 	}
 	
-	public function getExtraFieldValidation($fieldname){
-		if(!isset($this->_extraFieldRules[$fieldname])){
+	public function getExtraFieldValidation($fieldname) {
+		if (!isset($this->_extraFieldRules[$fieldname])) {
 			$this->_extraFieldRules[$fieldname]=new FieldValidation($fieldname);
 		}
 		return $this->_extraFieldRules[$fieldname];
 	}
 
-	public function addValidationParam($paramName,$paramValue,$before="",$after=""){
-		$this->addBehavior($this->_validationParams, $paramName, $paramValue,$before,$after);
+	public function addValidationParam($paramName, $paramValue, $before="", $after="") {
+		$this->addBehavior($this->_validationParams, $paramName, $paramValue, $before, $after);
 		return $this;
 	}
 
@@ -214,7 +214,7 @@ 
 		return $this;
 	}
 	
-	public function hasValidationParams(){
+	public function hasValidationParams() {
 		return sizeof($this->_validationParams)>0;
 	}
 
@@ -222,7 +222,7 @@ 
 		return $this->_validationParams;
 	}
 
-	public function removeValidationParam($param){
+	public function removeValidationParam($param) {
 		unset($this->_validationParams[$param]);
 		return $this;
 	}

Ajax/semantic/widgets/base/FieldAsTrait.php

Spacing +122 added lines, -122 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,205 +103,205 @@ 
 	}
 
 
-	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 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/common/Widget.php

Spacing +86 added lines, -86 removed lines

@@ -21,7 +21,7 @@ 
 use Ajax\common\html\traits\BaseHooksTrait;
 
 abstract class Widget extends HtmlDoubleElement {
-	use FieldAsTrait,FormTrait,BaseHooksTrait;
+	use FieldAsTrait, FormTrait, BaseHooksTrait;
 
 	/**
 	 * @var string classname
@@ -56,17 +56,17 @@ 
 	protected $_hasRules;
 	
 
-	public function __construct($identifier,$model,$modelInstance=NULL) {
+	public function __construct($identifier, $model, $modelInstance=NULL) {
 		parent::__construct($identifier);
 		$this->_template="%wrapContentBefore%%content%%wrapContentAfter%";
 		$this->setModel($model);
-		if(isset($modelInstance)){
+		if (isset($modelInstance)) {
 			$this->show($modelInstance);
 		}
 		$this->_generated=false;
 	}
 
-	protected function _init($instanceViewer,$contentKey,$content,$edition){
+	protected function _init($instanceViewer, $contentKey, $content, $edition) {
 		$this->_instanceViewer=$instanceViewer;
 		$this->content=[$contentKey=>$content];
 		$this->_self=$content;
@@ -78,31 +78,31 @@ 
 	 * @param int|string $fieldName
 	 * @return int|string|boolean
 	 */
-	protected function _getIndex($fieldName){
+	protected function _getIndex($fieldName) {
 		$index=$fieldName;
-		if(\is_string($fieldName)){
+		if (\is_string($fieldName)) {
 			$fields=$this->_instanceViewer->getVisibleProperties();
 			$index=\array_search($fieldName, $fields);
 		}
 		return $index;
 	}
 
-	protected function _getFieldIdentifier($prefix,$name=""){
+	protected function _getFieldIdentifier($prefix, $name="") {
 		return $this->identifier."-{$prefix}-".$this->_instanceViewer->getIdentifier();
 	}
 
-	protected function _getFieldName($index){
+	protected function _getFieldName($index) {
 		return $this->_instanceViewer->getFieldName($index);
 	}
 
-	protected function _getFieldCaption($index){
+	protected function _getFieldCaption($index) {
 		return $this->_instanceViewer->getCaption($index);
 	}
 
-	abstract protected  function _setToolbarPosition($table,$captions=NULL);
+	abstract protected  function _setToolbarPosition($table, $captions=NULL);
 
-	public function show($modelInstance){
-		if(\is_array($modelInstance)){
+	public function show($modelInstance) {
+		if (\is_array($modelInstance)) {
 			$modelInstance=\json_decode(\json_encode($modelInstance), FALSE);
 		}
 		$this->_modelInstance=$modelInstance;
@@ -128,7 +128,7 @@ 
 
 	abstract public function getHtmlComponent();
 
-	public function setAttached($value=true){
+	public function setAttached($value=true) {
 		return $this->getHtmlComponent()->setAttached($value);
 	}
 
@@ -139,65 +139,65 @@ 
 	 * @param callable $callback function called after the field compilation
 	 * @return Widget
 	 */
-	public function afterCompile($index,$callback){
+	public function afterCompile($index, $callback) {
 		$index=$this->_getIndex($index);
 		$this->_instanceViewer->afterCompile($index, $callback);
 		return $this;
 	}
 
-	public function setColor($color){
+	public function setColor($color) {
 		return $this->getHtmlComponent()->setColor($color);
 	}
 
 
-	public function setCaptions($captions){
+	public function setCaptions($captions) {
 		$this->_instanceViewer->setCaptions($captions);
 		return $this;
 	}
 
-	public function setCaption($index,$caption){
+	public function setCaption($index, $caption) {
 		$this->_instanceViewer->setCaption($this->_getIndex($index), $caption);
 		return $this;
 	}
 
-	public function setFields($fields){
+	public function setFields($fields) {
 		$this->_instanceViewer->setVisibleProperties($fields);
 		return $this;
 	}
 
-	public function addField($field,$key=null){
-		$this->_instanceViewer->addField($field,$key);
+	public function addField($field, $key=null) {
+		$this->_instanceViewer->addField($field, $key);
 		return $this;
 	}
 
-	public function addFields($fields){
+	public function addFields($fields) {
 		$this->_instanceViewer->addFields($fields);
 		return $this;
 	}
 	
-	public function countFields(){
+	public function countFields() {
 		return $this->_instanceViewer->visiblePropertiesCount();
 	}
 
-	public function addMessage($attributes=NULL,$fieldName="message"){
+	public function addMessage($attributes=NULL, $fieldName="message") {
 		$this->_instanceViewer->addField($fieldName);
 		$count=$this->_instanceViewer->visiblePropertiesCount();
-		return $this->fieldAsMessage($count-1,$attributes);
+		return $this->fieldAsMessage($count-1, $attributes);
 	}
 
-	public function addErrorMessage(){
-		return $this->addMessage(["error"=>true],"message");
+	public function addErrorMessage() {
+		return $this->addMessage(["error"=>true], "message");
 	}
 
-	public function insertField($index,$field,$key=null){
+	public function insertField($index, $field, $key=null) {
 		$index=$this->_getIndex($index);
-		$this->_instanceViewer->insertField($index, $field,$key);
+		$this->_instanceViewer->insertField($index, $field, $key);
 		return $this;
 	}
 
-	public function insertInField($index,$field,$key=null){
+	public function insertInField($index, $field, $key=null) {
 		$index=$this->_getIndex($index);
-		$this->_instanceViewer->insertInField($index, $field,$key);
+		$this->_instanceViewer->insertInField($index, $field, $key);
 		return $this;
 	}
 
@@ -207,13 +207,13 @@ 
 	 * @param callable $callback function parameters are : $value : the field value, $instance : the active instance of model, $fieldIndex : the field index, $rowIndex : the row index
 	 * @return Widget
 	 */
-	public function setValueFunction($index,$callback){
+	public function setValueFunction($index, $callback) {
 		$index=$this->_getIndex($index);
 		$this->_instanceViewer->setValueFunction($index, $callback);
 		return $this;
 	}
 
-	public function setIdentifierFunction($callback){
+	public function setIdentifierFunction($callback) {
 		$this->_instanceViewer->setIdentifierFunction($callback);
 		return $this;
 	}
@@ -221,8 +221,8 @@ 
 	/**
 	 * @return \Ajax\semantic\html\collections\menus\HtmlMenu
 	 */
-	public function getToolbar(){
-		if(isset($this->_toolbar)===false){
+	public function getToolbar() {
+		if (isset($this->_toolbar)===false) {
 			$this->_toolbar=new HtmlMenu("toolbar-".$this->identifier);
 		}
 		return $this->_toolbar;
@@ -234,15 +234,15 @@ 
 	 * @param callable $callback function to call on $element
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
-	public function addInToolbar($element,$callback=NULL){
+	public function addInToolbar($element, $callback=NULL) {
 		$tb=$this->getToolbar();
-		if($element instanceof BaseWidget){
-			if($element->getIdentifier()===""){
+		if ($element instanceof BaseWidget) {
+			if ($element->getIdentifier()==="") {
 				$element->setIdentifier("tb-item-".$this->identifier."-".$tb->count());
 			}
 		}
-		if(isset($callback)){
-			if(\is_callable($callback)){
+		if (isset($callback)) {
+			if (\is_callable($callback)) {
 				$callback($element);
 			}
 		}
@@ -255,9 +255,9 @@ 
 	 * @param callable $callback function($element)
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
-	public function addItemInToolbar($caption,$icon=NULL,$callback=NULL){
-		$result=$this->addInToolbar($caption,$callback);
-		if(isset($icon) && method_exists($result, "addIcon"))
+	public function addItemInToolbar($caption, $icon=NULL, $callback=NULL) {
+		$result=$this->addInToolbar($caption, $callback);
+		if (isset($icon) && method_exists($result, "addIcon"))
 			$result->addIcon($icon);
 		return $result;
 	}
@@ -267,14 +267,14 @@ 
 	 * @param callable $callback function($element)
 	 * @return \Ajax\common\Widget
 	 */
-	public function addItemsInToolbar(array $items,$callback=NULL){
-		if(JArray::isAssociative($items)){
-			foreach ($items as $icon=>$item){
-				$this->addItemInToolbar($item,$icon,$callback);
+	public function addItemsInToolbar(array $items, $callback=NULL) {
+		if (JArray::isAssociative($items)) {
+			foreach ($items as $icon=>$item) {
+				$this->addItemInToolbar($item, $icon, $callback);
 			}
-		}else{
-			foreach ($items as $item){
-				$this->addItemInToolbar($item,null,$callback);
+		} else {
+			foreach ($items as $item) {
+				$this->addItemInToolbar($item, null, $callback);
 			}
 		}
 		return $this;
@@ -286,12 +286,12 @@ 
 	 * @param callable $callback function($element)
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
-	public function addDropdownInToolbar($value,$items,$callback=NULL){
+	public function addDropdownInToolbar($value, $items, $callback=NULL) {
 		$dd=$value;
 		if (\is_string($value)) {
-			$dd=new HtmlDropdown("dropdown-". $this->identifier."-".$value, $value, $items);
+			$dd=new HtmlDropdown("dropdown-".$this->identifier."-".$value, $value, $items);
 		}
-		return $this->addInToolbar($dd,$callback);
+		return $this->addInToolbar($dd, $callback);
 	}
 
 	/**
@@ -300,9 +300,9 @@ 
 	 * @param callable $callback function($element)
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
-	public function addButtonInToolbar($caption,$cssStyle=null,$callback=NULL){
-		$bt=new HtmlButton("bt-".$caption,$caption,$cssStyle);
-		return $this->addInToolbar($bt,$callback);
+	public function addButtonInToolbar($caption, $cssStyle=null, $callback=NULL) {
+		$bt=new HtmlButton("bt-".$caption, $caption, $cssStyle);
+		return $this->addInToolbar($bt, $callback);
 	}
 
 	/**
@@ -311,9 +311,9 @@ 
 	 * @param callable $callback function($element)
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
-	public function addButtonsInToolbar(array $captions,$asIcon=false,$callback=NULL){
-		$bts=new HtmlButtonGroups("",$captions,$asIcon);
-		return $this->addInToolbar($bts,$callback);
+	public function addButtonsInToolbar(array $captions, $asIcon=false, $callback=NULL) {
+		$bts=new HtmlButtonGroups("", $captions, $asIcon);
+		return $this->addInToolbar($bts, $callback);
 	}
 
 	/**
@@ -323,15 +323,15 @@ 
 	 * @param boolean $labeled
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
-	public function addLabelledIconButtonInToolbar($caption,$icon,$before=true,$labeled=false){
-		$bt=new HtmlButton("",$caption);
-		$bt->addIcon($icon,$before,$labeled);
+	public function addLabelledIconButtonInToolbar($caption, $icon, $before=true, $labeled=false) {
+		$bt=new HtmlButton("", $caption);
+		$bt->addIcon($icon, $before, $labeled);
 		return $this->addInToolbar($bt);
 	}
 
-	public function addSubmitInToolbar($identifier,$value,$cssStyle=NULL,$url=NULL,$responseElement=NULL,$parameters=NULL){
-		$button=new HtmlButton($identifier,$value,$cssStyle);
-		$this->_buttonAsSubmit($button,"click",$url,$responseElement,$parameters);
+	public function addSubmitInToolbar($identifier, $value, $cssStyle=NULL, $url=NULL, $responseElement=NULL, $parameters=NULL) {
+		$button=new HtmlButton($identifier, $value, $cssStyle);
+		$this->_buttonAsSubmit($button, "click", $url, $responseElement, $parameters);
 		return $this->addInToolbar($button);
 	}
 
@@ -361,7 +361,7 @@ 
 	 * @param callable $defaultValueFunction function parameters are : $name : the field name, $value : the field value ,$index : the field index, $instance : the active instance of model
 	 * @return \Ajax\common\Widget
 	 */
-	public function setDefaultValueFunction($defaultValueFunction){
+	public function setDefaultValueFunction($defaultValueFunction) {
 		$this->_instanceViewer->setDefaultValueFunction($defaultValueFunction);
 		return $this;
 	}
@@ -369,7 +369,7 @@ 
 	/**
 	 * @return callable
 	 */
-	public function getDefaultValueFunction(){
+	public function getDefaultValueFunction() {
 		return $this->_instanceViewer->getDefaultValueFunction();
 	}
 
@@ -377,7 +377,7 @@ 
 	 * @param string|boolean $disable
 	 * @return string
 	 */
-	public function jsDisabled($disable=true){
+	public function jsDisabled($disable=true) {
 		return "$('#".$this->identifier." .ui.input,#".$this->identifier." .ui.dropdown,#".$this->identifier." .ui.checkbox').toggleClass('disabled',".$disable.");";
 	}
 
@@ -386,12 +386,12 @@ 
 	 * @param callable $callback function($element)
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
-	public function addEditButtonInToolbar($caption,$callback=NULL){
-		$bt=new HtmlButton($this->identifier."-editBtn",$caption);
+	public function addEditButtonInToolbar($caption, $callback=NULL) {
+		$bt=new HtmlButton($this->identifier."-editBtn", $caption);
 		$bt->setToggle();
 		$bt->setActive($this->_edition);
 		$bt->onClick($this->jsDisabled(Javascript::prep_value("!$(event.target).hasClass('active')")));
-		return $this->addInToolbar($bt,$callback);
+		return $this->addInToolbar($bt, $callback);
 	}
 
 	public function setToolbar(HtmlMenu $_toolbar) {
@@ -405,34 +405,34 @@ 
 	}
 
 	public function getForm() {
-		if(!isset($this->_form)){
+		if (!isset($this->_form)) {
 			$this->_form=new HtmlForm("frm-".$this->identifier);
 			$this->setEdition(true);
 		}
 		return $this->_form;
 	}
 
-	public function run(JsUtils $js){
+	public function run(JsUtils $js) {
 		parent::run($js);
-		if(isset($this->_form)){
+		if (isset($this->_form)) {
 			$this->runForm($js);
 		}
 	}
 
-	protected function runForm(JsUtils $js){
+	protected function runForm(JsUtils $js) {
 		$fields=$this->getContentInstances(HtmlFormField::class);
-		foreach ($fields as $field){
+		foreach ($fields as $field) {
 			$this->_form->addField($field);
 		}
 		return $this->_form->run($js);
 	}
 
-	protected function _compileForm(){
-		if(isset($this->_form)){
+	protected function _compileForm() {
+		if (isset($this->_form)) {
 			$noValidate="";
-			if(\sizeof($this->_form->getValidationParams())>0)
+			if (\sizeof($this->_form->getValidationParams())>0)
 				$noValidate="novalidate";
-			$this->wrapContent("<form class='ui form' id='frm-".$this->identifier."' name='frm-".$this->identifier."' ".$noValidate.">","</form>");
+			$this->wrapContent("<form class='ui form' id='frm-".$this->identifier."' name='frm-".$this->identifier."' ".$noValidate.">", "</form>");
 		}
 	}
 
@@ -447,33 +447,33 @@ 
 		return $this;
 	}
 
-	public function moveFieldTo($from,$to){
+	public function moveFieldTo($from, $to) {
 		return $this->_instanceViewer->moveFieldTo($from, $to);
 	}
 
-	public function swapFields($index1,$index2){
+	public function swapFields($index1, $index2) {
 		$index1=$this->_getIndex($index1);
 		$index2=$this->_getIndex($index2);
 		return $this->_instanceViewer->swapFields($index1, $index2);
 	}
 
-	public function removeField($index){
+	public function removeField($index) {
 		$index=$this->_getIndex($index);
 		$this->_instanceViewer->removeField($index);
 		return $this;
 	}
 
-	public function asModal($header=null){
-		$modal=new HtmlModal("modal-".$this->identifier,$header);
+	public function asModal($header=null) {
+		$modal=new HtmlModal("modal-".$this->identifier, $header);
 		$modal->setContent($this);
-		if(isset($this->_form)){
+		if (isset($this->_form)) {
 			$this->_form->onSuccess($modal->jsHide());
 		}
 		return $modal;
 	}
 
 	public function addToProperty($name, $value, $separator=" ") {
-		return $this->getHtmlComponent()->addToProperty($name,$value,$separator);
+		return $this->getHtmlComponent()->addToProperty($name, $value, $separator);
 	}
 	/**
 	 * @return mixed

Ajax/common/traits/JsUtilsActionsTrait.php

Spacing +55 added lines, -55 removed lines

@@ -11,7 +11,7 @@ 
  */
 trait JsUtilsActionsTrait {
 
-	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);
 	/**
 	 * show or hide with effect
 	 *
@@ -22,7 +22,7 @@ 
 	 * @param boolean $immediatly defers the execution if set to false
 	 * @return string
 	 */
-	protected function _showHideWithEffect($action,$element='this', $speed='', $callback='', $immediatly=false) {
+	protected function _showHideWithEffect($action, $element='this', $speed='', $callback='', $immediatly=false) {
 		$element=Javascript::prep_element($element);
 		$speed=$this->_validate_speed($speed);
 		if ($callback!='') {
@@ -39,8 +39,8 @@ 
 	 * @return string
 	 */
 	private function _validate_speed($speed) {
-		if (in_array($speed, array (
-				'slow','normal','fast'
+		if (in_array($speed, array(
+				'slow', 'normal', 'fast'
 		))) {
 			$speed='"'.$speed.'"';
 		} elseif (preg_match("/[^0-9]/", $speed)) {
@@ -57,7 +57,7 @@ 
 	 * @param string $param
 	 * @param boolean $immediatly delayed if false
 	 */
-	public function _genericCallValue($jQueryCall,$element='this', $param="", $immediatly=false) {
+	public function _genericCallValue($jQueryCall, $element='this', $param="", $immediatly=false) {
 		$element=Javascript::prep_element($element);
 		if (isset($param)) {
 			$param=Javascript::prep_value($param);
@@ -77,7 +77,7 @@ 
 	 * @param boolean $immediatly delayed if false
 	 * @return string
 	 */
-	public function _genericCallElement($jQueryCall,$to='this', $element, $immediatly=false) {
+	public function _genericCallElement($jQueryCall, $to='this', $element, $immediatly=false) {
 		$to=Javascript::prep_element($to);
 		$element=Javascript::prep_element($element);
 		$str="$({$to}).{$jQueryCall}({$element});";
@@ -94,7 +94,7 @@ 
 	 * @return string
 	 */
 	public function addClass($element='this', $class='', $immediatly=false) {
-		return $this->_genericCallValue('addClass',$element, $class, $immediatly);
+		return $this->_genericCallValue('addClass', $element, $class, $immediatly);
 	}
 
 	/**
@@ -104,8 +104,8 @@ 
 	 * @param boolean $immediatly defers the execution if set to false
 	 * @return string
 	 */
-	public function after($to, $element, $immediatly=false){
-		return $this->_genericCallElement('after',$to, $element, $immediatly);
+	public function after($to, $element, $immediatly=false) {
+		return $this->_genericCallElement('after', $to, $element, $immediatly);
 	}
 
 	/**
@@ -115,8 +115,8 @@ 
 	 * @param boolean $immediatly defers the execution if set to false
 	 * @return string
 	 */
-	public function before($to, $element, $immediatly=false){
-		return $this->_genericCallElement('before',$to, $element, $immediatly);
+	public function before($to, $element, $immediatly=false) {
+		return $this->_genericCallElement('before', $to, $element, $immediatly);
 	}
 
 	/**
@@ -144,8 +144,8 @@ 
 	 * @param string $value
 	 * @param boolean $immediatly defers the execution if set to false
 	 */
-	public function val($element='this',$value='',$immediatly=false){
-		return $this->_genericCallValue('val',$element,$value,$immediatly);
+	public function val($element='this', $value='', $immediatly=false) {
+		return $this->_genericCallValue('val', $element, $value, $immediatly);
 	}
 
 	/**
@@ -155,7 +155,7 @@ 
 	 * @param boolean $immediatly defers the execution if set to false
 	 */
 	public function html($element='this', $value='', $immediatly=false) {
-		return $this->_genericCallValue('html',$element, $value, $immediatly);
+		return $this->_genericCallValue('html', $element, $value, $immediatly);
 	}
 
 	/**
@@ -174,7 +174,7 @@ 
 
 		$animations="\t\t\t";
 		if (\is_array($params)) {
-			foreach ( $params as $param => $value ) {
+			foreach ($params as $param => $value) {
 				$animations.=$param.': \''.$value.'\', ';
 			}
 		}
@@ -203,7 +203,7 @@ 
 	 * @return string
 	 */
 	public function append($to, $element, $immediatly=false) {
-		return $this->_genericCallElement('append',$to, $element, $immediatly);
+		return $this->_genericCallElement('append', $to, $element, $immediatly);
 	}
 
 	/**
@@ -214,7 +214,7 @@ 
 	 * @return string
 	 */
 	public function prepend($to, $element, $immediatly=false) {
-		return $this->_genericCallElement('prepend',$to, $element, $immediatly);
+		return $this->_genericCallElement('prepend', $to, $element, $immediatly);
 	}
 
 	/**
@@ -227,7 +227,7 @@ 
 	 * @return string
 	 */
 	public function fadeIn($element='this', $speed='', $callback='', $immediatly=false) {
-		return $this->_showHideWithEffect("fadeIn",$element,$speed,$callback,$immediatly);
+		return $this->_showHideWithEffect("fadeIn", $element, $speed, $callback, $immediatly);
 	}
 
 	/**
@@ -240,7 +240,7 @@ 
 	 * @return string
 	 */
 	public function fadeOut($element='this', $speed='', $callback='', $immediatly=false) {
-		return $this->_showHideWithEffect("fadeOut",$element,$speed,$callback,$immediatly);
+		return $this->_showHideWithEffect("fadeOut", $element, $speed, $callback, $immediatly);
 	}
 
 	/**
@@ -253,7 +253,7 @@ 
 	 * @return string
 	 */
 	public function slideUp($element='this', $speed='', $callback='', $immediatly=false) {
-		return $this->_showHideWithEffect("slideUp",$element,$speed,$callback,$immediatly);
+		return $this->_showHideWithEffect("slideUp", $element, $speed, $callback, $immediatly);
 	}
 
 	/**
@@ -265,7 +265,7 @@ 
 	 * @return string
 	 */
 	public function removeClass($element='this', $class='', $immediatly=false) {
-		return $this->_genericCallValue('removeClass',$element, $class, $immediatly);
+		return $this->_genericCallValue('removeClass', $element, $class, $immediatly);
 	}
 
 	/**
@@ -278,7 +278,7 @@ 
 	 * @return string
 	 */
 	public function slideDown($element='this', $speed='', $callback='', $immediatly=false) {
-		return $this->_showHideWithEffect("slideDown",$element,$speed,$callback,$immediatly);
+		return $this->_showHideWithEffect("slideDown", $element, $speed, $callback, $immediatly);
 	}
 
 	/**
@@ -291,7 +291,7 @@ 
 	 * @return string
 	 */
 	public function slideToggle($element='this', $speed='', $callback='', $immediatly=false) {
-		return $this->_showHideWithEffect("slideToggle",$element,$speed,$callback,$immediatly);
+		return $this->_showHideWithEffect("slideToggle", $element, $speed, $callback, $immediatly);
 	}
 
 	/**
@@ -304,7 +304,7 @@ 
 	 * @return string
 	 */
 	public function hide($element='this', $speed='', $callback='', $immediatly=false) {
-		return $this->_showHideWithEffect("hide",$element,$speed,$callback,$immediatly);
+		return $this->_showHideWithEffect("hide", $element, $speed, $callback, $immediatly);
 	}
 
 	/**
@@ -317,7 +317,7 @@ 
 	 * @return string
 	 */
 	public function toggle($element='this', $speed='', $callback='', $immediatly=false) {
-		return $this->_showHideWithEffect("toggle",$element,$speed,$callback,$immediatly);
+		return $this->_showHideWithEffect("toggle", $element, $speed, $callback, $immediatly);
 	}
 
 	/**
@@ -329,7 +329,7 @@ 
 	 * @return string
 	 */
 	public function toggleClass($element='this', $class='', $immediatly=false) {
-		return $this->_genericCallValue('toggleClass',$element, $class, $immediatly);
+		return $this->_genericCallValue('toggleClass', $element, $class, $immediatly);
 	}
 
 	/**
@@ -357,7 +357,7 @@ 
 	 * @return string
 	 */
 	public function show($element='this', $speed='', $callback='', $immediatly=false) {
-		return $this->_showHideWithEffect("show",$element,$speed,$callback,$immediatly);
+		return $this->_showHideWithEffect("show", $element, $speed, $callback, $immediatly);
 	}
 
 	/**
@@ -369,8 +369,8 @@ 
 	 */
 	public function sortable($element, $options=array()) {
 		if (count($options)>0) {
-			$sort_options=array ();
-			foreach ( $options as $k => $v ) {
+			$sort_options=array();
+			foreach ($options as $k => $v) {
 				$sort_options[]="\n\t\t".$k.': '.$v."";
 			}
 			$sort_options=implode(",", $sort_options);
@@ -467,8 +467,8 @@ 
 	 * @param boolean $immediatly
 	 * @return string
 	 */
-	private function _doJQueryOn($event, $element, $elementToModify, $jqueryCall, $param="", $preventDefault=false, $stopPropagation=false, $jsCallback="",$immediatly=true) {
-		return $this->_add_event($element, $this->_doJQuery($elementToModify, $jqueryCall, $param, $jsCallback), $event, $preventDefault, $stopPropagation,$immediatly);
+	private function _doJQueryOn($event, $element, $elementToModify, $jqueryCall, $param="", $preventDefault=false, $stopPropagation=false, $jsCallback="", $immediatly=true) {
+		return $this->_add_event($element, $this->_doJQuery($elementToModify, $jqueryCall, $param, $jsCallback), $event, $preventDefault, $stopPropagation, $immediatly);
 	}
 
 	/**
@@ -486,7 +486,7 @@ 
 		$preventDefault=false;
 		$immediatly=true;
 		extract($parameters);
-		return $this->_doJQueryOn($event, $element, $elementToModify, $jqueryCall, $param, $preventDefault, $stopPropagation, $jsCallback,$immediatly);
+		return $this->_doJQueryOn($event, $element, $elementToModify, $jqueryCall, $param, $preventDefault, $stopPropagation, $jsCallback, $immediatly);
 	}
 
 	/**
@@ -527,11 +527,11 @@ 
 		$preventDefault=false;
 		$immediatly=true;
 		extract($parameters);
-		$script=$this->_add_event($element, $this->exec($js), $event, $preventDefault, $stopPropagation,$immediatly);
+		$script=$this->_add_event($element, $this->exec($js), $event, $preventDefault, $stopPropagation, $immediatly);
 		return $script;
 	}
 	
-	public function setJsonToElement($json,$elementClass="_element",$immediatly=true){
+	public function setJsonToElement($json, $elementClass="_element", $immediatly=true) {
 		$retour="var data={$json};"
 				."\n\tdata=($.isPlainObject(data))?data:JSON.parse(data);"
 				."\n\tvar pk=data['pk'];var object=data['object'];"
@@ -542,7 +542,7 @@ 
 				."\n\t});"
 				."\n}};\n";
 		$retour.="\t$(document).trigger('jsonReady',[data]);\n";
-		return $this->exec($retour,$immediatly);
+		return $this->exec($retour, $immediatly);
 	}
 	
 	/**
@@ -550,10 +550,10 @@ 
 	 * @param string $element The element selector
 	 * @param array $parameters default : array("attr"=>"id","preventDefault"=>false,"stopPropagation"=>false,"immediatly"=>true)
 	 */
-	public function setDraggable($element,$parameters=[]){
+	public function setDraggable($element, $parameters=[]) {
 		$attr="id";
 		extract($parameters);
-		$script=$this->_add_event($element, Javascript::draggable($attr), "dragstart",$parameters);
+		$script=$this->_add_event($element, Javascript::draggable($attr), "dragstart", $parameters);
 		return $script;
 	}
 	
@@ -563,13 +563,13 @@ 
 	 * @param array $parameters default : array("attr"=>"id","stopPropagation"=>false,"immediatly"=>true,"jqueryDone"=>"append")
 	 * @param string $jsCallback the js script to call when element is dropped
 	 */
-	public function asDropZone($element,$jsCallback="",$parameters=[]){
+	public function asDropZone($element, $jsCallback="", $parameters=[]) {
 		$stopPropagation=false;
 		$immediatly=true;
 		$jqueryDone="append";
-		$script=$this->_add_event($element, '', "dragover",true,$stopPropagation,$immediatly);
+		$script=$this->_add_event($element, '', "dragover", true, $stopPropagation, $immediatly);
 		extract($parameters);
-		$script.=$this->_add_event($element, Javascript::dropZone($jqueryDone,$jsCallback), "drop",true,$stopPropagation,$immediatly);
+		$script.=$this->_add_event($element, Javascript::dropZone($jqueryDone, $jsCallback), "drop", true, $stopPropagation, $immediatly);
 		return $script;
 	}
 	
@@ -581,16 +581,16 @@ 
 	 * @param boolean $immediatly delayed if false
 	 * @return string
 	 */
-	public function interval($jsCode,$time,$globalName=null,$immediatly=true){
-		if(!Javascript::isFunction($jsCode)){
+	public function interval($jsCode, $time, $globalName=null, $immediatly=true) {
+		if (!Javascript::isFunction($jsCode)) {
 			$jsCode="function(){\n".$jsCode."\n}";
 		}
-		if(isset($globalName)){
+		if (isset($globalName)) {
 			$script="if(window.{$globalName}){clearInterval(window.{$globalName});}\nwindow.{$globalName}=setInterval({$jsCode},{$time});";
-		}else{
+		} else {
 			$script="setInterval({$jsCode},{$time});";
 		}
-		return $this->exec($script,$immediatly);
+		return $this->exec($script, $immediatly);
 	}
 	
 	/**
@@ -599,8 +599,8 @@ 
 	 * @param boolean $immediatly delayed if false
 	 * @return string
 	 */
-	public function clearInterval($globalName,$immediatly=true){
-		return $this->exec("if(window.{$globalName}){clearInterval(window.{$globalName});}",$immediatly);
+	public function clearInterval($globalName, $immediatly=true) {
+		return $this->exec("if(window.{$globalName}){clearInterval(window.{$globalName});}", $immediatly);
 	}
 	
 	/**
@@ -613,17 +613,17 @@ 
 	 * @param boolean $immediatly delayed if false
 	 * @return string
 	 */
-	public function counter($counterSelector,$value=0,$limit=0,$globalName=null,$countDown=true,$immediatly=true){
+	public function counter($counterSelector, $value=0, $limit=0, $globalName=null, $countDown=true, $immediatly=true) {
 		$stop="";
-		if($countDown){
+		if ($countDown) {
 			$stop="if (--timer < ".$limit.") {clearInterval(interval);display.trigger({type:'counter-end',value: timer,limit:".$limit."});}";
-		}else{
-			if($limit!=0){
+		} else {
+			if ($limit!=0) {
 				$stop="if (++timer > ".$limit.") {clearInterval(interval);display.trigger({type:'counter-end',value: timer,limit:".$limit."});}";
 			}
 		}
 		$global="";
-		if(isset($globalName)){
+		if (isset($globalName)) {
 			$global="\nwindow.{$globalName}=interval;";
 		}
 		$timer="var startTimer=function(duration, display) {var timer = duration, minutes, seconds;
@@ -639,7 +639,7 @@ 
 										".$global."
 										}";
 		$element='$("'.$counterSelector.'")';
-		return $this->exec($timer."\nstartTimer(".$value.",".$element.");",$immediatly);
+		return $this->exec($timer."\nstartTimer(".$value.",".$element.");", $immediatly);
 	}
 	
 	/**
@@ -653,7 +653,7 @@ 
 	 * @param boolean $countDown count down if true or elapse if false
 	 * @return string
 	 */
-	public function counterOn($element,$event,$counterSelector,$value=0,$limit=0,$globalName=null,$countDown=true){
-		return $this->execOn($event, $element, $this->counter($counterSelector,$value,$limit,$globalName,$countDown,false));
+	public function counterOn($element, $event, $counterSelector, $value=0, $limit=0, $globalName=null, $countDown=true) {
+		return $this->execOn($event, $element, $this->counter($counterSelector, $value, $limit, $globalName, $countDown, false));
 	}
 }

Ajax/common/traits/JsUtilsAjaxTrait.php

Spacing +119 added lines, -119 removed lines

@@ -17,11 +17,11 @@ 
 	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 interval($jsCode,$time,$globalName=null,$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);
 
-	protected function _ajax($method,$url,$responseElement="",$parameters=[]) {
-		if(isset($this->params["ajax"])){
+	protected function _ajax($method, $url, $responseElement="", $parameters=[]) {
+		if (isset($this->params["ajax"])) {
 			extract($this->params["ajax"]);
 		}
 		extract($parameters);
@@ -31,111 +31,111 @@ 
 		$originalSelector=$responseElement;
 		$responseElement=$this->_getResponseElement($responseElement);
 		$retour.="var self=this;\n";
-		$before=isset($before)?$before:"";
+		$before=isset($before) ? $before : "";
 		$retour.=$before;
-		if($hasLoader===true && JString::isNotNull($responseElement)){
-			$this->addLoading($retour, $responseElement,$ajaxLoader);
-		}elseif($hasLoader==="internal"){
+		if ($hasLoader===true && JString::isNotNull($responseElement)) {
+			$this->addLoading($retour, $responseElement, $ajaxLoader);
+		}elseif ($hasLoader==="internal") {
 			$retour.="\n$(this).addClass('loading');";
 		}
-		$ajaxParameters=["url"=>"url","method"=>"'".\strtoupper($method)."'"];
+		$ajaxParameters=["url"=>"url", "method"=>"'".\strtoupper($method)."'"];
 		
-		$ajaxParameters["async"]=($async?"true":"false");
+		$ajaxParameters["async"]=($async ? "true" : "false");
 		
-		if(isset($params)){
+		if (isset($params)) {
 			$ajaxParameters["data"]=self::_correctParams($params);
 		}
-		if(isset($headers)){
+		if (isset($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.=$this->_getOnAjaxDone($responseElement, $jqueryDone, $ajaxTransition, $jsCallback, $hasLoader, ($historize ? $originalSelector : null))."});\n";
+		$retour=$this->_addJsCondition($jsCondition, $retour);
 		if ($immediatly)
 			$this->jquery_code_for_compile[]=$retour;
 		return $retour;
 	}
 
-	protected function createAjaxParameters(&$original,$parameters){
-		$validParameters=["dataType"=>"'%value%'","beforeSend"=>"function(jqXHR,settings){%value%}","complete"=>"function(jqXHR){%value%}"];
-		foreach ($validParameters as $param=>$mask){
-			if(isset($parameters[$param])){
+	protected function createAjaxParameters(&$original, $parameters) {
+		$validParameters=["dataType"=>"'%value%'", "beforeSend"=>"function(jqXHR,settings){%value%}", "complete"=>"function(jqXHR){%value%}"];
+		foreach ($validParameters as $param=>$mask) {
+			if (isset($parameters[$param])) {
 				$original[$param]=\str_replace("%value%", $parameters[$param], $mask);
 			}
 		}
 	}
 
-	protected function implodeAjaxParameters($ajaxParameters){
-		$s = ''; foreach ($ajaxParameters as $k=>$v) { if ($s !== '') { $s .= ','; } $s .= "'{$k}':{$v}"; }
+	protected function implodeAjaxParameters($ajaxParameters) {
+		$s=''; foreach ($ajaxParameters as $k=>$v) { if ($s!=='') { $s.=','; } $s.="'{$k}':{$v}"; }
 		return $s;
 	}
 
-	protected function _addJsCondition($jsCondition,$jsSource){
-		if(isset($jsCondition)){
+	protected function _addJsCondition($jsCondition, $jsSource) {
+		if (isset($jsCondition)) {
 			return "if(".$jsCondition."){\n".$jsSource."\n}";
 		}
 		return $jsSource;
 	}
 
 
-	protected function _getAjaxUrl($url,$attr){
+	protected function _getAjaxUrl($url, $attr) {
 		$url=$this->_correctAjaxUrl($url);
 		$retour="url='".$url."';";
 		$slash="/";
-		if(JString::endswith($url, "/")===true){
+		if (JString::endswith($url, "/")===true) {
 			$slash="";
 		}
-		if(JString::isNotNull($attr)){
-			if ($attr==="value"){
+		if (JString::isNotNull($attr)) {
+			if ($attr==="value") {
 				$retour.="url=url+'".$slash."'+$(this).val();\n";
-			}elseif ($attr==="html"){
+			}elseif ($attr==="html") {
 				$retour.="url=url+'".$slash."'+$(this).html();\n";
-			}elseif(\substr($attr, 0,3)==="js:"){
+			}elseif (\substr($attr, 0, 3)==="js:") {
 				$retour.="url=url+'".$slash."'+".\substr($attr, 3).";\n";
-			}elseif($attr!==null && $attr!=="")
+			}elseif ($attr!==null && $attr!=="")
 				$retour.="url=url+'".$slash."'+($(this).attr('".$attr."')||'');\n";
 		}
 		return $retour;
 	}
 	
-	protected function onPopstate(){
+	protected function onPopstate() {
 		return "window.onpopstate = function(e){if(e.state){var target=e.state.jqueryDone;$(e.state.selector)[target](e.state.html);}};";
 	}
 	
-	protected function autoActiveLinks($previousURL="window.location.href"){
-		$result= "\nfunction getHref(url) { return \$('a').filter(function(){return \$(this).prop('href') == url; });}";
+	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)){
+			if (isset($ajaxTransition)) {
 				$call=$this->setAjaxDataCall($ajaxTransition);
-			}elseif(isset($this->ajaxTransition)){
+			}elseif (isset($this->ajaxTransition)) {
 				$call=$this->ajaxTransition;
 			}
-			if(\is_callable($call))
-				$retour="\t".$call($responseElement,$jqueryDone).";\n";
+			if (\is_callable($call))
+				$retour="\t".$call($responseElement, $jqueryDone).";\n";
 			else
 				$retour="\t{$responseElement}.{$jqueryDone}( data );\n";
 		}
-		if(isset($history)){
-			if($this->params["autoActiveLinks"]){
+		if (isset($history)) {
+			if ($this->params["autoActiveLinks"]) {
 				$retour.=$this->autoActiveLinks("url");
 			}
 			$retour.="\nwindow.history.pushState({'html':data,'selector':".Javascript::prep_value($history).",'jqueryDone':'{$jqueryDone}'},'', url);";
 		}
-		if($hasLoader==="internal"){
+		if ($hasLoader==="internal") {
 			$retour.="\n$(self).removeClass('loading');";
 		}
 		$retour.="\t".$jsCallback."\n";
 		return $retour;
 	}
 
-	protected function _getResponseElement($responseElement){
+	protected function _getResponseElement($responseElement) {
 		if (JString::isNotNull($responseElement)) {
 			$responseElement=Javascript::prep_jquery_selector($responseElement);
 		}
@@ -145,33 +145,33 @@ 
 	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) {
+			if (strncmp($url, 'http://', 7)!=0 && strncmp($url, 'https://', 8)!=0) {
 				$url=$this->getUrl($url);
 			}
 			return $url;
 	}
 
-	public static function _correctParams($params){
-		if(JString::isNull($params)){
+	public static function _correctParams($params) {
+		if (JString::isNull($params)) {
 			return "";
 		}
-		if(\preg_match("@^\{.*?\}$@", $params)){
+		if (\preg_match("@^\{.*?\}$@", $params)) {
 			return '$.param('.$params.')';
 		}
 		return $params;
 	}
 
-	public static function _implodeParams($parameters){
+	public static function _implodeParams($parameters) {
 		$allParameters=[];
-		foreach ($parameters as $params){
-			if(isset($params))
+		foreach ($parameters as $params) {
+			if (isset($params))
 				$allParameters[]=self::_correctParams($params);
 		}
 		return \implode("+'&'+", $allParameters);
 	}
 
-	protected function addLoading(&$retour, $responseElement,$ajaxLoader=null) {
-		if(!isset($ajaxLoader)){
+	protected function addLoading(&$retour, $responseElement, $ajaxLoader=null) {
+		if (!isset($ajaxLoader)) {
 			$ajaxLoader=$this->ajaxLoader;
 		}
 		$loading_notifier='<div class="ajax-loader">'.$ajaxLoader.'</div>';
@@ -179,19 +179,19 @@ 
 		$retour.="\t\t{$responseElement}.prepend('{$loading_notifier}');\n";
 	}
 
-	protected function setAjaxDataCall($params){
+	protected function setAjaxDataCall($params) {
 		$result=null;
-		if(!\is_callable($params)){
-			$result=function ($responseElement,$jqueryDone="html") use($params){
-				return AjaxTransition::{$params}($responseElement,$jqueryDone);
+		if (!\is_callable($params)) {
+			$result=function($responseElement, $jqueryDone="html") use($params){
+				return AjaxTransition::{$params}($responseElement, $jqueryDone);
 			};
 		}
 		return $result;
 	}
 
-	protected function setDefaultParameters(&$parameters,$default){
-		foreach ($default as $k=>$v){
-			if(!isset($parameters[$k]))
+	protected function setDefaultParameters(&$parameters, $default) {
+		foreach ($default as $k=>$v) {
+			if (!isset($parameters[$k]))
 				$parameters[$k]=$v;
 		}
 	}
@@ -205,8 +205,8 @@ 
 	 * @param string $url The url of the request
 	 * @param string $responseElement selector of the HTML element displaying the answer
 	 */
-	private function _get($url, $responseElement="",$parameters=[]) {
-		return $this->_ajax("get", $url,$responseElement,$parameters);
+	private function _get($url, $responseElement="", $parameters=[]) {
+		return $this->_ajax("get", $url, $responseElement, $parameters);
 	}
 
 	/**
@@ -215,9 +215,9 @@ 
 	 * @param string $responseElement selector of the HTML element displaying the answer
 	 * @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=[]) {
+	public function get($url, $responseElement="", $parameters=[]) {
 		$parameters["immediatly"]=true;
-		return $this->_get($url,$responseElement,$parameters);
+		return $this->_get($url, $responseElement, $parameters);
 	}
 
 	/**
@@ -227,9 +227,9 @@ 
 	 * @param string $responseElement selector of the HTML element displaying the answer
 	 * @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=[]) {
+	public function ajax($method, $url, $responseElement="", $parameters=[]) {
 		$parameters["immediatly"]=true;
-		return $this->_ajax($method,$url,$responseElement,$parameters);
+		return $this->_ajax($method, $url, $responseElement, $parameters);
 	}
 	
 	/**
@@ -242,8 +242,8 @@ 
 	 * @param array $parameters  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=[]){
-		return $this->interval($this->ajaxDeferred($method, $url,$responseElement,$parameters), $interval,$globalName);
+	public function ajaxInterval($method, $url, $interval, $globalName=null, $responseElement="", $parameters=[]) {
+		return $this->interval($this->ajaxDeferred($method, $url, $responseElement, $parameters), $interval, $globalName);
 	}
 
 	/**
@@ -253,9 +253,9 @@ 
 	 * @param string $responseElement selector of the HTML element displaying the answer
 	 * @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=[]) {
+	public function ajaxDeferred($method, $url, $responseElement="", $parameters=[]) {
 		$parameters["immediatly"]=false;
-		return $this->_ajax($method,$url,$responseElement,$parameters);
+		return $this->_ajax($method, $url, $responseElement, $parameters);
 	}
 
 	/**
@@ -264,8 +264,8 @@ 
 	 * @param string $method Method used
 	 * @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,["hasLoader"=>false]);
+	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.";"
@@ -273,7 +273,7 @@ 
 				."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);
+		return $this->_ajax($method, $url, null, $parameters);
 	}
 	
 	/**
@@ -283,7 +283,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=[]) {
-		return $this->_json($url,$method,$parameters);
+		return $this->_json($url, $method, $parameters);
 	}
 
 	/**
@@ -294,9 +294,9 @@ 
 	 * @param string $method default get
 	 * @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()) {
-		$this->setDefaultParameters($parameters, ["preventDefault"=>true,"stopPropagation"=>true,"immediatly"=>true]);
-		return $this->_add_event($element, $this->jsonDeferred($url,$method, $parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"],$parameters["immediatly"]);
+	public function jsonOn($event, $element, $url, $method="get", $parameters=array()) {
+		$this->setDefaultParameters($parameters, ["preventDefault"=>true, "stopPropagation"=>true, "immediatly"=>true]);
+		return $this->_add_event($element, $this->jsonDeferred($url, $method, $parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"], $parameters["immediatly"]);
 	}
 
 	/**
@@ -307,7 +307,7 @@ 
 	 */
 	public function jsonDeferred($url, $method="get", $parameters=[]) {
 		$parameters["immediatly"]=false;
-		return $this->_json($url,$method,$parameters);
+		return $this->_json($url, $method, $parameters);
 	}
 
 	/**
@@ -318,27 +318,27 @@ 
 	 * @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,["hasLoader"=>false]);
+		$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){
+		if ($context===null) {
 			$parent="$('".$maskSelector."').parent()";
-			$newElm = "$('#'+newId)";
-		}else{
+			$newElm="$('#'+newId)";
+		} else {
 			$parent=$context;
-			$newElm = $context.".find('#'+newId)";
+			$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();
 		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.=$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);
+		return $this->_ajax($method, $url, null, $parameters);
 	}
 
 	/**
@@ -349,7 +349,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=[]) {
-		return $this->_jsonArray($maskSelector, $url,$method,$parameters);
+		return $this->_jsonArray($maskSelector, $url, $method, $parameters);
 	}
 
 	/**
@@ -372,9 +372,9 @@ 
 	 * @param string $method Method used, default : get
 	 * @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()) {
-		$this->setDefaultParameters($parameters, ["preventDefault"=>true,"stopPropagation"=>true,"immediatly"=>true]);
-		return $this->_add_event($element, $this->jsonArrayDeferred($maskSelector,$url,$method, $parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"],$parameters["immediatly"]);
+	public function jsonArrayOn($event, $element, $maskSelector, $url, $method="get", $parameters=array()) {
+		$this->setDefaultParameters($parameters, ["preventDefault"=>true, "stopPropagation"=>true, "immediatly"=>true]);
+		return $this->_add_event($element, $this->jsonArrayDeferred($maskSelector, $url, $method, $parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"], $parameters["immediatly"]);
 	}
 
 	/**
@@ -386,7 +386,7 @@ 
 	 */
 	public function getDeferred($url, $responseElement="", $parameters=[]) {
 		$parameters["immediatly"]=false;
-		return $this->_get($url, $responseElement,$parameters);
+		return $this->_get($url, $responseElement, $parameters);
 	}
 
 	/**
@@ -399,8 +399,8 @@ 
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>null,"headers"=>null,"historize"=>false)
 	 */
 	public function getOn($event, $element, $url, $responseElement="", $parameters=array()) {
-		$this->setDefaultParameters($parameters, ["preventDefault"=>true,"stopPropagation"=>true,"immediatly"=>true]);
-		return $this->_add_event($element, $this->getDeferred($url,$responseElement,$parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"],$parameters["immediatly"]);
+		$this->setDefaultParameters($parameters, ["preventDefault"=>true, "stopPropagation"=>true, "immediatly"=>true]);
+		return $this->_add_event($element, $this->getDeferred($url, $responseElement, $parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"], $parameters["immediatly"]);
 	}
 
 	/**
@@ -413,8 +413,8 @@ 
 	 * @param array $parameters default : array("method"=>"get","preventDefault"=>true,"stopPropagation"=>true,"params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","jsCondition"=>NULL,"headers"=>null,"historize"=>false)
 	 */
 	public function ajaxOn($event, $element, $url, $responseElement="", $parameters=array()) {
-		$this->setDefaultParameters($parameters, ["preventDefault"=>true,"stopPropagation"=>true,"immediatly"=>true,"method"=>"get"]);
-		return $this->_add_event($element, $this->ajaxDeferred($parameters["method"],$url,$responseElement,$parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"],$parameters["immediatly"]);
+		$this->setDefaultParameters($parameters, ["preventDefault"=>true, "stopPropagation"=>true, "immediatly"=>true, "method"=>"get"]);
+		return $this->_add_event($element, $this->ajaxDeferred($parameters["method"], $url, $responseElement, $parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"], $parameters["immediatly"]);
 	}
 
 	/**
@@ -448,15 +448,15 @@ 
 	 * @param array $parameters 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()){
+	public function getHref($element, $responseElement="", $parameters=array()) {
 		$parameters["attr"]="href";
-		if(JString::isNull($responseElement)){
+		if (JString::isNull($responseElement)) {
 			$responseElement='%$(self).attr("data-target")%';
 		}
-		if(!isset($parameters["historize"])){
+		if (!isset($parameters["historize"])) {
 			$parameters["historize"]=true;
 		}
-		return $this->getOnClick($element, "",$responseElement,$parameters);
+		return $this->getOnClick($element, "", $responseElement, $parameters);
 	}
 	
 	/**
@@ -466,20 +466,20 @@ 
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"params"=>"{}","jsCallback"=>NULL,"attr"=>"href","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","jsCondition"=>NULL,"headers"=>null,"historize"=>false)
 	 * @return $this
 	 */
-	public function postHref($element,$responseElement="",$parameters=array()){
+	public function postHref($element, $responseElement="", $parameters=array()) {
 		$parameters["attr"]="href";
-		if(JString::isNull($responseElement)){
+		if (JString::isNull($responseElement)) {
 			$responseElement='%$(this).attr("data-target")%';
 		}
-		if(!isset($parameters["historize"])){
+		if (!isset($parameters["historize"])) {
 			$parameters["historize"]=true;
 		}
-		return $this->postOnClick($element, "","{}",$responseElement,$parameters);
+		return $this->postOnClick($element, "", "{}", $responseElement, $parameters);
 	}
 
-	private function _post($url, $params="{}",$responseElement="", $parameters=[]) {
+	private function _post($url, $params="{}", $responseElement="", $parameters=[]) {
 		$parameters["params"]=$params;
-		return $this->_ajax("POST", $url,$responseElement,$parameters);
+		return $this->_ajax("POST", $url, $responseElement, $parameters);
 	}
 
 	/**
@@ -489,8 +489,8 @@ 
 	 * @param string $params JSON parameters
 	 * @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=[]) {
-		return $this->_post($url, $params,$responseElement, $parameters);
+	public function post($url, $params="{}", $responseElement="", $parameters=[]) {
+		return $this->_post($url, $params, $responseElement, $parameters);
 	}
 
 	/**
@@ -501,7 +501,7 @@ 
 	 * @param string $responseElement selector of the HTML element displaying the answer
 	 * @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=[]) {
+	public function postDeferred($url, $params="{}", $responseElement="", $parameters=[]) {
 		$parameters["immediatly"]=false;
 		return $this->_post($url, $params, $responseElement, $parameters);
 	}
@@ -517,8 +517,8 @@ 
 	 * @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()) {
-		$this->setDefaultParameters($parameters, ["preventDefault"=>true,"stopPropagation"=>true,"immediatly"=>true]);
-		return $this->_add_event($element, $this->postDeferred($url, $params, $responseElement, $parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"],$parameters["immediatly"]);
+		$this->setDefaultParameters($parameters, ["preventDefault"=>true, "stopPropagation"=>true, "immediatly"=>true]);
+		return $this->_add_event($element, $this->postDeferred($url, $params, $responseElement, $parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"], $parameters["immediatly"]);
 	}
 
 	/**
@@ -535,33 +535,33 @@ 
 	}
 
 	private function _postForm($url, $form, $responseElement, $parameters=[]) {
-		if(isset($this->params["ajax"])){
+		if (isset($this->params["ajax"])) {
 			extract($this->params["ajax"]);
 		}
-		$params="{}";$validation=false;
+		$params="{}"; $validation=false;
 		\extract($parameters);
-		$async=($async)?"true":"false";
+		$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)){
+		if (isset($params)) {
 			$retour.="params+='&'+".self::_correctParams($params).";\n";
 		}
 		$responseElement=$this->_getResponseElement($responseElement);
 		$retour.="var self=this;\n";
-		if($hasLoader===true){
-			$this->addLoading($retour, $responseElement,$ajaxLoader);
-		}elseif($hasLoader==="internal"){
+		if ($hasLoader===true) {
+			$this->addLoading($retour, $responseElement, $ajaxLoader);
+		}elseif ($hasLoader==="internal") {
 			$retour.="\n$(this).addClass('loading');";
 		}
-		$ajaxParameters=["url"=>"url","method"=>"'POST'","data"=>"params","async"=>$async];
-		if(isset($headers)){
+		$ajaxParameters=["url"=>"url", "method"=>"'POST'", "data"=>"params", "async"=>$async];
+		if (isset($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.=$this->_getOnAjaxDone($responseElement, $jqueryDone, $ajaxTransition, $jsCallback, $hasLoader)."});\n";
 
 		if ($validation) {
 			$retour="$('#".$form."').validate({submitHandler: function(form) {
@@ -611,8 +611,8 @@ 
 	 * @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()) {
-		$this->setDefaultParameters($parameters, ["preventDefault"=>true,"stopPropagation"=>true,"immediatly"=>true]);
-		return $this->_add_event($element, $this->postFormDeferred($url, $form, $responseElement,$parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"],$parameters["immediatly"]);
+		$this->setDefaultParameters($parameters, ["preventDefault"=>true, "stopPropagation"=>true, "immediatly"=>true]);
+		return $this->_add_event($element, $this->postFormDeferred($url, $form, $responseElement, $parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"], $parameters["immediatly"]);
 	}
 
 	/**

Ajax/common/html/HtmlDoubleElement.php

Spacing +28 added lines, -28 removed lines

@@ -30,15 +30,15 @@ 
 		return $this->content;
 	}
 
-	public function addContent($content,$before=false) {
+	public function addContent($content, $before=false) {
 		if (!\is_array($this->content)) {
-			if(isset($this->content))
-				$this->content=array ($this->content);
+			if (isset($this->content))
+				$this->content=array($this->content);
 			else
 				$this->content=array();
 		}
-		if($before)
-			array_unshift($this->content,$content);
+		if ($before)
+			array_unshift($this->content, $content);
 		else
 			$this->content []=$content;
 		return $this;
@@ -53,7 +53,7 @@ 
 		if ($this->content instanceof HtmlDoubleElement) {
 			$this->content->run($js);
 		} else if (\is_array($this->content)) {
-			foreach ( $this->content as $itemContent ) {
+			foreach ($this->content as $itemContent) {
 				if ($itemContent instanceof HtmlDoubleElement) {
 					$itemContent->run($js);
 				}
@@ -70,19 +70,19 @@ 
 		return $this;
 	}
 
-	public function getContentInstances($class){
-		return $this->_getContentInstances($class,$this->content);
+	public function getContentInstances($class) {
+		return $this->_getContentInstances($class, $this->content);
 	}
 
-	protected function _getContentInstances($class,$content){
+	protected function _getContentInstances($class, $content) {
 		$instances=[];
-		if($content instanceof $class){
+		if ($content instanceof $class) {
 			$instances[]=$content;
-		}elseif($content instanceof HtmlDoubleElement){
-			$instances=\array_merge($instances,$content->getContentInstances($class));
-		}elseif (\is_array($content)){
-			foreach ($content as $element){
-				$instances=\array_merge($instances,$this->_getContentInstances($class, $element));
+		}elseif ($content instanceof HtmlDoubleElement) {
+			$instances=\array_merge($instances, $content->getContentInstances($class));
+		}elseif (\is_array($content)) {
+			foreach ($content as $element) {
+				$instances=\array_merge($instances, $this->_getContentInstances($class, $element));
 			}
 		}
 		return $instances;
@@ -92,36 +92,36 @@ 
 	 * Transforms the element into a link
 	 * @return HtmlDoubleElement
 	 */
-	public function asLink($href=NULL,$target=NULL) {
+	public function asLink($href=NULL, $target=NULL) {
 		if (isset($href))
 			$this->setProperty("href", $href);
-		if(isset($target))
+		if (isset($target))
 			$this->setProperty("target", $target);
 		return $this->setTagName("a");
 	}
 	
-	public function getTextContent(){
-		if(is_array($this->content)){
+	public function getTextContent() {
+		if (is_array($this->content)) {
 			return strip_tags(implode("", $this->content));
 		}
 		return strip_tags($this->content);
 	}
 	
-	public function asEditable(HtmlFormField $field,$asForm=false,$setValueProperty="val()"){
+	public function asEditable(HtmlFormField $field, $asForm=false, $setValueProperty="val()") {
 		$idF=$field->getIdentifier();
 		$idE=$idF;
-		if($asForm){
+		if ($asForm) {
 			$frm=new HtmlForm("frm-".$field->getIdentifier());
 			$frm->setProperty("onsubmit", "return false;");
 			$fields=$frm->addFields();
 			$idE=$frm->getIdentifier();
 			$fields->addItem($field);
-			$fields->addButtonIcon("bt-okay", "check","green mini","\$('#".$idE."').trigger('validate',{value: $('#'+idF+' input').val()});");
-			$fields->addButtonIcon("bt-cancel", "close","mini","\$('#".$idE."').trigger('endEdit');");
+			$fields->addButtonIcon("bt-okay", "check", "green mini", "\$('#".$idE."').trigger('validate',{value: $('#'+idF+' input').val()});");
+			$fields->addButtonIcon("bt-cancel", "close", "mini", "\$('#".$idE."').trigger('endEdit');");
 			$this->_editableContent=$frm;
 			$keypress="";
 			$focusOut="";
-		}else{
+		} else {
 			$focusOut="if(e.relatedTarget==null)elm.trigger('endEdit');";
 			$this->_editableContent=$field;
 			$keypress="$('#".$idF."').keyup(function(e){if(e.which == 13) {\$('#".$idE."').trigger('validate',{value: $('#'+idF+' input').val()});}if(e.keyCode===27) {\$('#".$idE."').trigger('endEdit');}});";
@@ -134,11 +134,11 @@ 
 	 * {@inheritDoc}
 	 * @see \Ajax\common\html\BaseHtml::compile_once()
 	 */
-	protected function compile_once(\Ajax\JsUtils $js = NULL, &$view = NULL) {
-		if(!$this->_compiled && isset($this->_editableContent)){
-			$this->wrap("",$this->_editableContent);
+	protected function compile_once(\Ajax\JsUtils $js=NULL, &$view=NULL) {
+		if (!$this->_compiled && isset($this->_editableContent)) {
+			$this->wrap("", $this->_editableContent);
 		}
-		parent::compile_once($js,$view);
+		parent::compile_once($js, $view);
 		
 	}
 

Ajax/common/html/traits/BaseHooksTrait.php

Spacing +7 added lines, -7 removed lines

@@ -9,7 +9,7 @@ 
 	 * @param string $hookKey
 	 * @return boolean
 	 */
-	public function hookExists($hookKey){
+	public function hookExists($hookKey) {
 		return isset($this->_hooks[$hookKey]);
 	}
 	
@@ -17,8 +17,8 @@ 
 	 * @param string $hookKey
 	 * @return callable|NULL
 	 */
-	public function getHook($hookKey){
-		if(isset($this->_hooks[$hookKey])){
+	public function getHook($hookKey) {
+		if (isset($this->_hooks[$hookKey])) {
 			return $this->_hooks[$hookKey];
 		}
 		return null;
@@ -29,7 +29,7 @@ 
 	 * @param String $hookKey
 	 * @param callable $callable
 	 */
-	public function addHook($hookKey,$callable){
+	public function addHook($hookKey, $callable) {
 		$this->_hooks[$hookKey]=$callable;
 	}
 	
@@ -39,9 +39,9 @@ 
 	 * @param mixed|null $variable
 	 * @return void|mixed
 	 */
-	public function execHook($hookKey,...$variables){
-		if(($hook=$this->getHook($hookKey))!=null){
-			return call_user_func_array($hook,$variables);
+	public function execHook($hookKey, ...$variables) {
+		if (($hook=$this->getHook($hookKey))!=null) {
+			return call_user_func_array($hook, $variables);
 		}
 		return;
 	}