phpMv / phpMv-UI

Ajax/semantic/widgets/datatable/DataTableFieldAsTrait.php

Doc Comments +34 added lines, -9 removed lines

@@ -15,15 +15,28 @@ 
  * @property InstanceViewer $_instanceViewer
  */
 trait DataTableFieldAsTrait{
+
+	/**
+	 * @param \Closure $field
+	 */
 	abstract public function addField($field);
+
+	/**
+	 * @param integer $index
+	 * @param \Closure $field
+	 */
 	abstract public function insertField($index,$field);
+
+	/**
+	 * @param \Closure $field
+	 */
 	abstract public function insertInField($index,$field);
 	abstract public function fieldAs($index,$type,$attributes=NULL);
 	/**
 	 * @param string $caption
 	 * @param callable $callback
 	 * @param boolean $visibleHover
-	 * @return callable
+	 * @return \Closure
 	 */
 	private function getFieldButtonCallable($caption,$visibleHover=true,$callback=null){
 		return $this->getCallable("getFieldButton",[$caption,$visibleHover],$callback);
@@ -33,7 +46,7 @@ 
 	 * @param callable $thisCallback
 	 * @param array $parameters
 	 * @param callable $callback
-	 * @return callable
+	 * @return \Closure
 	 */
 	private function getCallable($thisCallback,$parameters,$callback=null){
 		$result=function($instance) use($thisCallback,$parameters,$callback){
@@ -103,7 +116,7 @@ 
 	 * @param string $caption
 	 * @param callable $callback
 	 * @param boolean $visibleHover
-	 * @return DataTable
+	 * @return DataTableFieldAsTrait
 	 */
 	public function addFieldButton($caption,$visibleHover=true,$callback=null){
 		$this->addField($this->getCallable("getFieldButton",[$caption,$visibleHover],$callback));
@@ -115,7 +128,7 @@ 
 	 * @param array $buttons
 	 * @param callable $callback
 	 * @param boolean $visibleHover
-	 * @return DataTable
+	 * @return DataTableFieldAsTrait
 	 */
 	public function addFieldButtons($buttons,$visibleHover=true,$callback=null){
 		$this->addField($this->getCallable("getFieldButtons",[$buttons,$visibleHover],$callback));
@@ -127,7 +140,7 @@ 
 	 * @param int $index
 	 * @param string $caption
 	 * @param callable $callback
-	 * @return DataTable
+	 * @return DataTableFieldAsTrait
 	 */
 	public function insertFieldButton($index,$caption,$visibleHover=true,$callback=null){
 		$this->insertField($index, $this->getFieldButtonCallable($caption,$visibleHover,$callback));
@@ -139,18 +152,27 @@ 
 	 * @param int $index
 	 * @param string $caption
 	 * @param callable $callback
-	 * @return DataTable
+	 * @return DataTableFieldAsTrait
 	 */
 	public function insertInFieldButton($index,$caption,$visibleHover=true,$callback=null){
 		$this->insertInField($index, $this->getFieldButtonCallable($caption,$visibleHover,$callback));
 		return $this;
 	}
 
+	/**
+	 * @param string $icon
+	 * @param string $class
+	 * @param callable $callback
+	 */
 	private function addDefaultButton($icon,$class=null,$visibleHover=true,$callback=null){
 		$this->addField($this->getCallable("getDefaultButton",[$icon,$class,$visibleHover],$callback));
 		return $this;
 	}
 
+	/**
+	 * @param string $icon
+	 * @param string $class
+	 */
 	private function insertDefaultButtonIn($index,$icon,$class=null,$visibleHover=true,$callback=null){
 		$this->insertInField($index,$this->getCallable("getDefaultButton",[$icon,$class,$visibleHover],$callback));
 		return $this;
@@ -169,7 +191,7 @@ 
 	 * @param boolean $visibleHover
 	 * @param array $deleteBehavior default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"data-ajax","params"=>"{}","method"=>"get")
 	 * @param callable $callback this function takes the following arguments : $object=>the delete button, $instance : the active instance of the object
-	 * @return DataTable
+	 * @return DataTableFieldAsTrait
 	 */
 	public function addDeleteButton($visibleHover=true,$deleteBehavior=[],$callback=null){
 		$this->_deleteBehavior=$deleteBehavior;
@@ -181,7 +203,7 @@ 
 	 * @param string $visibleHover
 	 * @param array $editBehavior default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"data-ajax","params"=>"{}","method"=>"get")
 	 * @param callable $callback this function takes the following arguments : $object=>the delete button, $instance : the active instance of the object
-	 * @return DataTable
+	 * @return DataTableFieldAsTrait
 	 */
 	public function addEditButton($visibleHover=true,$editBehavior=[],$callback=null){
 		$this->_editBehavior=$editBehavior;
@@ -194,7 +216,7 @@ 
 	 * @param array $behavior default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"data-ajax","params"=>"{}","method"=>"get")
 	 * @param callable $callbackEdit this function takes the following arguments : $object=>the delete button, $instance : the active instance of the object
 	 * @param callable $callbackDelete this function takes the following arguments : $object=>the delete button, $instance : the active instance of the object
-	 * @return DataTable
+	 * @return DataTableFieldAsTrait
 	 */
 	public function addEditDeleteButtons($visibleHover=true,$behavior=[],$callbackEdit=null,$callbackDelete=null){
 		$this->addEditButton($visibleHover,$behavior,$callbackEdit);
@@ -203,6 +225,9 @@ 
 		return $this;
 	}
 
+	/**
+	 * @param callable $callback
+	 */
 	public function insertDeleteButtonIn($index,$visibleHover=true,$deleteBehavior=[],$callback=null){
 		$this->_deleteBehavior=$deleteBehavior;
 		return $this->insertDefaultButtonIn($index,"remove","_delete red basic",$visibleHover,$callback);

Spacing +56 added lines, -56 removed lines

@@ -14,19 +14,19 @@ 
  * @property boolean $_visibleHover
  * @property InstanceViewer $_instanceViewer
  */
-trait DataTableFieldAsTrait{
+trait DataTableFieldAsTrait {
 	abstract public function addField($field);
-	abstract public function insertField($index,$field);
-	abstract public function insertInField($index,$field);
-	abstract public function fieldAs($index,$type,$attributes=NULL);
+	abstract public function insertField($index, $field);
+	abstract public function insertInField($index, $field);
+	abstract public function fieldAs($index, $type, $attributes=NULL);
 	/**
 	 * @param string $caption
 	 * @param callable $callback
 	 * @param boolean $visibleHover
 	 * @return callable
 	 */
-	private function getFieldButtonCallable($caption,$visibleHover=true,$callback=null){
-		return $this->getCallable("getFieldButton",[$caption,$visibleHover],$callback);
+	private function getFieldButtonCallable($caption, $visibleHover=true, $callback=null) {
+		return $this->getCallable("getFieldButton", [$caption, $visibleHover], $callback);
 	}
 
 	/**
@@ -35,20 +35,20 @@ 
 	 * @param callable $callback
 	 * @return callable
 	 */
-	private function getCallable($thisCallback,$parameters,$callback=null){
-		$result=function($instance) use($thisCallback,$parameters,$callback){
-			$object=call_user_func_array(array($this,$thisCallback), $parameters);
-			if(isset($callback)){
-				if(\is_callable($callback)){
-					$callback($object,$instance,$this->_instanceViewer->count()+1);
+	private function getCallable($thisCallback, $parameters, $callback=null) {
+		$result=function($instance) use($thisCallback, $parameters, $callback){
+			$object=call_user_func_array(array($this, $thisCallback), $parameters);
+			if (isset($callback)) {
+				if (\is_callable($callback)) {
+					$callback($object, $instance, $this->_instanceViewer->count()+1);
 				}
 			}
-			if($object instanceof HtmlSemDoubleElement){
+			if ($object instanceof HtmlSemDoubleElement) {
 				$id=$this->_instanceViewer->getIdentifier();
-				$object->setProperty("data-ajax",$id);
-				if($object->propertyContains("class","visibleover")){
+				$object->setProperty("data-ajax", $id);
+				if ($object->propertyContains("class", "visibleover")) {
 					$this->_visibleHover=true;
-					$object->setProperty("style","visibility:hidden;");
+					$object->setProperty("style", "visibility:hidden;");
 				}
 			}
 			return $object;
@@ -60,16 +60,16 @@ 
 	 * @param string $caption
 	 * @return HtmlButton
 	 */
-	private function getFieldButton($caption,$visibleHover=true){
-		$bt= new HtmlButton("",$caption);
-		if($visibleHover)
+	private function getFieldButton($caption, $visibleHover=true) {
+		$bt=new HtmlButton("", $caption);
+		if ($visibleHover)
 			$this->_visibleOver($bt);
 		return $bt;
 	}
 
-	private function getFieldButtons($buttons,$visibleHover=true){
-		$bts=new HtmlButtonGroups("",$buttons);
-		if($visibleHover)
+	private function getFieldButtons($buttons, $visibleHover=true) {
+		$bts=new HtmlButtonGroups("", $buttons);
+		if ($visibleHover)
 			$this->_visibleOver($bts);
 		return $bts;
 	}
@@ -83,19 +83,19 @@ 
 	 * @param array $attributes associative array (<b>ajax</b> key is for ajax post)
 	 * @return DataTable
 	 */
-	public function fieldAsSubmit($index,$cssStyle=NULL,$url=NULL,$responseElement=NULL,$attributes=NULL){
-		return $this->_fieldAs(function($id,$name,$value,$caption) use ($url,$responseElement,$cssStyle,$index,$attributes){
-			$button=new HtmlButton($id,$value,$cssStyle);
-			$button->postOnClick($url,"$(event.target).closest('tr').find(':input').serialize()",$responseElement,$attributes["ajax"]);
-			if(!isset($attributes["visibleHover"]) || $attributes["visibleHover"])
+	public function fieldAsSubmit($index, $cssStyle=NULL, $url=NULL, $responseElement=NULL, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) use ($url, $responseElement, $cssStyle, $index, $attributes){
+			$button=new HtmlButton($id, $value, $cssStyle);
+			$button->postOnClick($url, "$(event.target).closest('tr').find(':input').serialize()", $responseElement, $attributes["ajax"]);
+			if (!isset($attributes["visibleHover"]) || $attributes["visibleHover"])
 				$this->_visibleOver($button);
 				return $button;
-		}, $index,$attributes);
+		}, $index, $attributes);
 	}
 
-	protected function _visibleOver(BaseHtml $element){
+	protected function _visibleOver(BaseHtml $element) {
 		$this->_visibleHover=true;
-		return $element->addToProperty("class", "visibleover")->setProperty("style","visibility:hidden;");
+		return $element->addToProperty("class", "visibleover")->setProperty("style", "visibility:hidden;");
 	}
 
 	/**
@@ -105,8 +105,8 @@ 
 	 * @param boolean $visibleHover
 	 * @return DataTable
 	 */
-	public function addFieldButton($caption,$visibleHover=true,$callback=null){
-		$this->addField($this->getCallable("getFieldButton",[$caption,$visibleHover],$callback));
+	public function addFieldButton($caption, $visibleHover=true, $callback=null) {
+		$this->addField($this->getCallable("getFieldButton", [$caption, $visibleHover], $callback));
 		return $this;
 	}
 
@@ -117,8 +117,8 @@ 
 	 * @param boolean $visibleHover
 	 * @return DataTable
 	 */
-	public function addFieldButtons($buttons,$visibleHover=true,$callback=null){
-		$this->addField($this->getCallable("getFieldButtons",[$buttons,$visibleHover],$callback));
+	public function addFieldButtons($buttons, $visibleHover=true, $callback=null) {
+		$this->addField($this->getCallable("getFieldButtons", [$buttons, $visibleHover], $callback));
 		return $this;
 	}
 
@@ -129,8 +129,8 @@ 
 	 * @param callable $callback
 	 * @return DataTable
 	 */
-	public function insertFieldButton($index,$caption,$visibleHover=true,$callback=null){
-		$this->insertField($index, $this->getFieldButtonCallable($caption,$visibleHover,$callback));
+	public function insertFieldButton($index, $caption, $visibleHover=true, $callback=null) {
+		$this->insertField($index, $this->getFieldButtonCallable($caption, $visibleHover, $callback));
 		return $this;
 	}
 
@@ -141,25 +141,25 @@ 
 	 * @param callable $callback
 	 * @return DataTable
 	 */
-	public function insertInFieldButton($index,$caption,$visibleHover=true,$callback=null){
-		$this->insertInField($index, $this->getFieldButtonCallable($caption,$visibleHover,$callback));
+	public function insertInFieldButton($index, $caption, $visibleHover=true, $callback=null) {
+		$this->insertInField($index, $this->getFieldButtonCallable($caption, $visibleHover, $callback));
 		return $this;
 	}
 
-	private function addDefaultButton($icon,$class=null,$visibleHover=true,$callback=null){
-		$this->addField($this->getCallable("getDefaultButton",[$icon,$class,$visibleHover],$callback));
+	private function addDefaultButton($icon, $class=null, $visibleHover=true, $callback=null) {
+		$this->addField($this->getCallable("getDefaultButton", [$icon, $class, $visibleHover], $callback));
 		return $this;
 	}
 
-	private function insertDefaultButtonIn($index,$icon,$class=null,$visibleHover=true,$callback=null){
-		$this->insertInField($index,$this->getCallable("getDefaultButton",[$icon,$class,$visibleHover],$callback));
+	private function insertDefaultButtonIn($index, $icon, $class=null, $visibleHover=true, $callback=null) {
+		$this->insertInField($index, $this->getCallable("getDefaultButton", [$icon, $class, $visibleHover], $callback));
 		return $this;
 	}
 
-	private function getDefaultButton($icon,$class=null,$visibleHover=true){
-		$bt=$this->getFieldButton("",$visibleHover);
+	private function getDefaultButton($icon, $class=null, $visibleHover=true) {
+		$bt=$this->getFieldButton("", $visibleHover);
 		$bt->asIcon($icon);
-		if(isset($class))
+		if (isset($class))
 			$bt->addClass($class);
 		return $bt;
 	}
@@ -171,9 +171,9 @@ 
 	 * @param callable $callback this function takes the following arguments : $object=>the delete button, $instance : the active instance of the object
 	 * @return DataTable
 	 */
-	public function addDeleteButton($visibleHover=true,$deleteBehavior=[],$callback=null){
+	public function addDeleteButton($visibleHover=true, $deleteBehavior=[], $callback=null) {
 		$this->_deleteBehavior=$deleteBehavior;
-		return $this->addDefaultButton("remove","_delete red basic",$visibleHover,$callback);
+		return $this->addDefaultButton("remove", "_delete red basic", $visibleHover, $callback);
 	}
 
 	/**
@@ -183,9 +183,9 @@ 
 	 * @param callable $callback this function takes the following arguments : $object=>the delete button, $instance : the active instance of the object
 	 * @return DataTable
 	 */
-	public function addEditButton($visibleHover=true,$editBehavior=[],$callback=null){
+	public function addEditButton($visibleHover=true, $editBehavior=[], $callback=null) {
 		$this->_editBehavior=$editBehavior;
-		return $this->addDefaultButton("edit","_edit basic",$visibleHover,$callback);
+		return $this->addDefaultButton("edit", "_edit basic", $visibleHover, $callback);
 	}
 
 	/**
@@ -196,20 +196,20 @@ 
 	 * @param callable $callbackDelete this function takes the following arguments : $object=>the delete button, $instance : the active instance of the object
 	 * @return DataTable
 	 */
-	public function addEditDeleteButtons($visibleHover=true,$behavior=[],$callbackEdit=null,$callbackDelete=null){
-		$this->addEditButton($visibleHover,$behavior,$callbackEdit);
+	public function addEditDeleteButtons($visibleHover=true, $behavior=[], $callbackEdit=null, $callbackDelete=null) {
+		$this->addEditButton($visibleHover, $behavior, $callbackEdit);
 		$index=$this->_instanceViewer->visiblePropertiesCount()-1;
-		$this->insertDeleteButtonIn($index,$visibleHover,$behavior,$callbackDelete);
+		$this->insertDeleteButtonIn($index, $visibleHover, $behavior, $callbackDelete);
 		return $this;
 	}
 
-	public function insertDeleteButtonIn($index,$visibleHover=true,$deleteBehavior=[],$callback=null){
+	public function insertDeleteButtonIn($index, $visibleHover=true, $deleteBehavior=[], $callback=null) {
 		$this->_deleteBehavior=$deleteBehavior;
-		return $this->insertDefaultButtonIn($index,"remove","_delete red basic",$visibleHover,$callback);
+		return $this->insertDefaultButtonIn($index, "remove", "_delete red basic", $visibleHover, $callback);
 	}
 
-	public function insertEditButtonIn($index,$visibleHover=true,$editBehavior=[],$callback=null){
+	public function insertEditButtonIn($index, $visibleHover=true, $editBehavior=[], $callback=null) {
 		$this->_editBehavior=$editBehavior;
-		return $this->insertDefaultButtonIn($index,"edit","_edit basic",$visibleHover,$callback);
+		return $this->insertDefaultButtonIn($index, "edit", "_edit basic", $visibleHover, $callback);
 	}
 }

Braces +12 added lines, -8 removed lines

@@ -62,15 +62,17 @@ 
 	 */
 	private function getFieldButton($caption,$visibleHover=true){
 		$bt= new HtmlButton("",$caption);
-		if($visibleHover)
-			$this->_visibleOver($bt);
+		if($visibleHover) {
+					$this->_visibleOver($bt);
+		}
 		return $bt;
 	}
 
 	private function getFieldButtons($buttons,$visibleHover=true){
 		$bts=new HtmlButtonGroups("",$buttons);
-		if($visibleHover)
-			$this->_visibleOver($bts);
+		if($visibleHover) {
+					$this->_visibleOver($bts);
+		}
 		return $bts;
 	}
 
@@ -87,8 +89,9 @@ 
 		return $this->_fieldAs(function($id,$name,$value,$caption) use ($url,$responseElement,$cssStyle,$index,$attributes){
 			$button=new HtmlButton($id,$value,$cssStyle);
 			$button->postOnClick($url,"$(event.target).closest('tr').find(':input').serialize()",$responseElement,$attributes["ajax"]);
-			if(!isset($attributes["visibleHover"]) || $attributes["visibleHover"])
-				$this->_visibleOver($button);
+			if(!isset($attributes["visibleHover"]) || $attributes["visibleHover"]) {
+							$this->_visibleOver($button);
+			}
 				return $button;
 		}, $index,$attributes);
 	}
@@ -159,8 +162,9 @@ 
 	private function getDefaultButton($icon,$class=null,$visibleHover=true){
 		$bt=$this->getFieldButton("",$visibleHover);
 		$bt->asIcon($icon);
-		if(isset($class))
-			$bt->addClass($class);
+		if(isset($class)) {
+					$bt->addClass($class);
+		}
 		return $bt;
 	}
 

Ajax/semantic/html/elements/HtmlButton.php

Doc Comments +1 added lines, -1 removed lines

@@ -47,7 +47,7 @@
 
 	/**
 	 * define the button style
-	 * @param string|int $cssStyle
+	 * @param string $cssStyle
 	 * @return HtmlButton default : ""
 	 */
 	public function setStyle($cssStyle) {

Spacing +23 added lines, -23 removed lines

@@ -55,7 +55,7 @@ 
 	}
 
 	public function setFocusable($value=true) {
-		if ($value === true)
+		if ($value===true)
 			$this->setProperty("tabindex", "0");
 		else {
 			$this->removeProperty("tabindex");
@@ -65,14 +65,14 @@ 
 
 	public function setAnimated($content, $animation="") {
 		$this->setTagName("div");
-		$this->addToProperty("class", "animated " . $animation);
-		$visible=new HtmlSemDoubleElement("visible-" . $this->identifier, "div");
+		$this->addToProperty("class", "animated ".$animation);
+		$visible=new HtmlSemDoubleElement("visible-".$this->identifier, "div");
 		$visible->setClass("visible content");
 		$visible->setContent($this->content);
-		$hidden=new HtmlSemDoubleElement("hidden-" . $this->identifier, "div");
+		$hidden=new HtmlSemDoubleElement("hidden-".$this->identifier, "div");
 		$hidden->setClass("hidden content");
 		$hidden->setContent($content);
-		$this->content=array ($visible,$hidden );
+		$this->content=array($visible, $hidden);
 		return $hidden;
 	}
 
@@ -84,7 +84,7 @@ 
 	public function asIcon($icon) {
 		$iconO=$icon;
 		if (\is_string($icon)) {
-			$iconO=new HtmlIcon("icon-" . $this->identifier, $icon);
+			$iconO=new HtmlIcon("icon-".$this->identifier, $icon);
 		}
 		$this->addToProperty("class", "icon");
 		$this->content=$iconO;
@@ -104,17 +104,17 @@ 
 	 * @return HtmlLabel
 	 */
 	public function addLabel($label, $before=false, $icon=NULL) {
-		$this->tagName="div";$prefix="";
-		if($before)
+		$this->tagName="div"; $prefix="";
+		if ($before)
 			$prefix="left ";
 		$this->addToProperty("class", $prefix."labeled");
 		$isIcon=(isset($this->content[0]) && $this->content[0] instanceof HtmlIcon);
-		$this->content=new HtmlButton("button-" . $this->identifier, $this->content);
-		if($isIcon){
+		$this->content=new HtmlButton("button-".$this->identifier, $this->content);
+		if ($isIcon) {
 			$this->content->addClass("icon");
 		}
 		$this->content->setTagName("div");
-		$label=new HtmlLabel("label-" . $this->identifier, $label, $icon,"a");
+		$label=new HtmlLabel("label-".$this->identifier, $label, $icon, "a");
 		$label->setBasic();
 		$this->addContent($label, $before);
 		return $label;
@@ -126,7 +126,7 @@ 
 	 */
 	public function fromArray($array) {
 		$array=parent::fromArray($array);
-		foreach ( $array as $key => $value ) {
+		foreach ($array as $key => $value) {
 			$this->setProperty($key, $value);
 		}
 		return $array;
@@ -140,10 +140,10 @@ 
 		return $this->addToProperty("class", "positive");
 	}
 
-	public function setColor($color){
-		if(\is_array($this->content)){
-			foreach ($this->content as $content){
-				if($content instanceof HtmlButton)
+	public function setColor($color) {
+		if (\is_array($this->content)) {
+			foreach ($this->content as $content) {
+				if ($content instanceof HtmlButton)
 					$content->setColor($color);
 			}
 		}
@@ -201,7 +201,7 @@ 
 	 * @return HtmlButton
 	 */
 	public static function social($identifier, $social, $value=NULL) {
-		if ($value === NULL)
+		if ($value===NULL)
 			$value=\ucfirst($social);
 		$return=new HtmlButton($identifier, $value);
 		$return->addIcon($social);
@@ -238,8 +238,8 @@ 
 	 * {@inheritDoc}
 	 * @see HtmlSemDoubleElement::asLink()
 	 */
-	public function asLink($href=NULL,$target=NULL) {
-		parent::asLink($href,$target);
+	public function asLink($href=NULL, $target=NULL) {
+		parent::asLink($href, $target);
 		return $this;
 	}
 
@@ -252,10 +252,10 @@ 
 	 * @param string $icon
 	 * @return HtmlButtonGroups
 	 */
-	public static function dropdown($identifier,$value,$items=[],$asCombo=false,$icon=null){
-		$result=new HtmlButtonGroups($identifier,[$value]);
-		$result->addDropdown($items,$asCombo);
-		if(isset($icon))
+	public static function dropdown($identifier, $value, $items=[], $asCombo=false, $icon=null) {
+		$result=new HtmlButtonGroups($identifier, [$value]);
+		$result->addDropdown($items, $asCombo);
+		if (isset($icon))
 			$result->setIcon($icon);
 		return $result;
 	}

Braces +17 added lines, -13 removed lines

@@ -55,9 +55,9 @@ 
 	}
 
 	public function setFocusable($value=true) {
-		if ($value === true)
-			$this->setProperty("tabindex", "0");
-		else {
+		if ($value === true) {
+					$this->setProperty("tabindex", "0");
+		} else {
 			$this->removeProperty("tabindex");
 		}
 		return $this;
@@ -105,8 +105,9 @@ 
 	 */
 	public function addLabel($label, $before=false, $icon=NULL) {
 		$this->tagName="div";$prefix="";
-		if($before)
-			$prefix="left ";
+		if($before) {
+					$prefix="left ";
+		}
 		$this->addToProperty("class", $prefix."labeled");
 		$isIcon=(isset($this->content[0]) && $this->content[0] instanceof HtmlIcon);
 		$this->content=new HtmlButton("button-" . $this->identifier, $this->content);
@@ -143,12 +144,13 @@ 
 	public function setColor($color){
 		if(\is_array($this->content)){
 			foreach ($this->content as $content){
-				if($content instanceof HtmlButton)
-					$content->setColor($color);
+				if($content instanceof HtmlButton) {
+									$content->setColor($color);
+				}
 			}
+		} else {
+					parent::setColor($color);
 		}
-		else
-			parent::setColor($color);
 		return $this;
 	}
 
@@ -201,8 +203,9 @@ 
 	 * @return HtmlButton
 	 */
 	public static function social($identifier, $social, $value=NULL) {
-		if ($value === NULL)
-			$value=\ucfirst($social);
+		if ($value === NULL) {
+					$value=\ucfirst($social);
+		}
 		$return=new HtmlButton($identifier, $value);
 		$return->addIcon($social);
 		return $return->addToPropertyCtrl("class", $social, Social::getConstants());
@@ -255,8 +258,9 @@ 
 	public static function dropdown($identifier,$value,$items=[],$asCombo=false,$icon=null){
 		$result=new HtmlButtonGroups($identifier,[$value]);
 		$result->addDropdown($items,$asCombo);
-		if(isset($icon))
-			$result->setIcon($icon);
+		if(isset($icon)) {
+					$result->setIcon($icon);
+		}
 		return $result;
 	}
 }

Ajax/common/traits/JsUtilsEventsTrait.php

Spacing +6 added lines, -6 removed lines

@@ -11,11 +11,11 @@ 
 trait JsUtilsEventsTrait {
 
 
-	protected $jquery_events=array (
-			"bind","blur","change","click","dblclick","delegate","die","error","focus","focusin","focusout","hover","keydown","keypress","keyup","live","load","mousedown","mousseenter","mouseleave","mousemove","mouseout","mouseover","mouseup","off","on","one","ready","resize","scroll","select","submit","toggle","trigger","triggerHandler","undind","undelegate","unload"
+	protected $jquery_events=array(
+			"bind", "blur", "change", "click", "dblclick", "delegate", "die", "error", "focus", "focusin", "focusout", "hover", "keydown", "keypress", "keyup", "live", "load", "mousedown", "mousseenter", "mouseleave", "mousemove", "mouseout", "mouseover", "mouseup", "off", "on", "one", "ready", "resize", "scroll", "select", "submit", "toggle", "trigger", "triggerHandler", "undind", "undelegate", "unload"
 	);
 
-	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);
 
 	/**
 	 * Outputs a javascript library blur event
@@ -49,9 +49,9 @@ 
 	 * @param boolean $stopPropagation
 	 * @return string
 	 */
-	public function click($element='this', $js='', $ret_false=TRUE,$preventDefault=false,$stopPropagation=false) {
+	public function click($element='this', $js='', $ret_false=TRUE, $preventDefault=false, $stopPropagation=false) {
 		if (!is_array($js)) {
-			$js=array (
+			$js=array(
 					$js
 			);
 		}
@@ -60,7 +60,7 @@ 
 			$js[]="return false;";
 		}
 
-		return $this->_add_event($element, $js, 'click',$preventDefault,$stopPropagation);
+		return $this->_add_event($element, $js, 'click', $preventDefault, $stopPropagation);
 	}
 
 	/**

Ajax/semantic/html/elements/HtmlStep.php

Spacing +23 added lines, -23 removed lines

@@ -9,12 +9,12 @@ 
 use Ajax\common\html\HtmlDoubleElement;
 use Ajax\semantic\html\base\constants\Side;
 
-class HtmlStep extends HtmlSemCollection{
+class HtmlStep extends HtmlSemCollection {
 	protected $_activeStep;
 	protected $_startStep;
 
-	public function __construct( $identifier,$steps=array()){
-		parent::__construct( $identifier,"div", "ui steps");
+	public function __construct($identifier, $steps=array()) {
+		parent::__construct($identifier, "div", "ui steps");
 		$this->addItems($steps);
 	}
 
@@ -24,7 +24,7 @@ 
 	 * @see \Ajax\common\html\html5\HtmlCollection::createItem()
 	 */
 	protected function createItem($value) {
-		$itemO=new HtmlStepItem("item-".\sizeof($this->content),$value);
+		$itemO=new HtmlStepItem("item-".\sizeof($this->content), $value);
 		return $itemO;
 	}
 
@@ -32,50 +32,50 @@ 
 	 * @param string|array $step
 	 * @return HtmlStepItem
 	 */
-	public function addStep($step){
+	public function addStep($step) {
 		return $this->addItem($step);
 	}
 
-	public function setOrdered(){
+	public function setOrdered() {
 		return $this->addToProperty("class", "ordered");
 	}
 
-	public function isOrdered(){
+	public function isOrdered() {
 		return $this->propertyContains("class", "ordered");
 	}
 
-	public function setVertical(){
+	public function setVertical() {
 		return $this->addToProperty("class", "vertical");
 	}
 
-	protected function defineActiveStep(){
+	protected function defineActiveStep() {
 		$activestep=$this->_activeStep;
 		$count=$this->count();
-		if(!$this->isOrdered()){
-			for($i=$this->_startStep;$i<$count;$i++){
+		if (!$this->isOrdered()) {
+			for ($i=$this->_startStep; $i<$count; $i++) {
 				$step=$this->content[$i];
 				$step->removeStatus();
-				if($i<$activestep)
+				if ($i<$activestep)
 					$step->setCompleted();
 				elseif ($i===$activestep)
 					$step->setActive();
 				else
 					$step->setDisabled();
 			}
-		}else{
-			foreach ($this->content as $step){
+		} else {
+			foreach ($this->content as $step) {
 				$step->removeStatus();
 			}
-			if($activestep<$count)
+			if ($activestep<$count)
 				$this->content[$activestep]->setActive();
 		}
 		return $this;
 	}
 
 	public function compile(JsUtils $js=NULL, &$view=NULL) {
-		if(isset($this->_activeStep) && \is_numeric($this->_activeStep))
+		if (isset($this->_activeStep) && \is_numeric($this->_activeStep))
 			$this->defineActiveStep();
-		return parent::compile($js,$view);
+		return parent::compile($js, $view);
 	}
 
 	public function setActiveStep($_activeStep) {
@@ -83,15 +83,15 @@ 
 		return $this;
 	}
 
-	public function setAttached($side="",HtmlDoubleElement $toElement=NULL){
-		if(isset($toElement)){
-			$toElement->addToPropertyCtrl("class", "attached",array("attached"));
+	public function setAttached($side="", HtmlDoubleElement $toElement=NULL) {
+		if (isset($toElement)) {
+			$toElement->addToPropertyCtrl("class", "attached", array("attached"));
 		}
-		return $this->addToPropertyCtrl("class", $side." attached",Side::getConstantValues("attached"));
+		return $this->addToPropertyCtrl("class", $side." attached", Side::getConstantValues("attached"));
 	}
 
-	public function asLink(){
-		foreach ($this->content as $step){
+	public function asLink() {
+		foreach ($this->content as $step) {
 			$step->asLink();
 		}
 		return $this;

Braces +14 added lines, -11 removed lines

@@ -55,26 +55,29 @@
 			for($i=$this->_startStep;$i<$count;$i++){
 				$step=$this->content[$i];
 				$step->removeStatus();
-				if($i<$activestep)
-					$step->setCompleted();
-				elseif ($i===$activestep)
-					$step->setActive();
-				else
-					$step->setDisabled();
+				if($i<$activestep) {
+									$step->setCompleted();
+				} elseif ($i===$activestep) {
+									$step->setActive();
+				} else {
+									$step->setDisabled();
+				}
 			}
-		}else{
+		} else{
 			foreach ($this->content as $step){
 				$step->removeStatus();
 			}
-			if($activestep<$count)
-				$this->content[$activestep]->setActive();
+			if($activestep<$count) {
+							$this->content[$activestep]->setActive();
+			}
 		}
 		return $this;
 	}
 
 	public function compile(JsUtils $js=NULL, &$view=NULL) {
-		if(isset($this->_activeStep) && \is_numeric($this->_activeStep))
-			$this->defineActiveStep();
+		if(isset($this->_activeStep) && \is_numeric($this->_activeStep)) {
+					$this->defineActiveStep();
+		}
 		return parent::compile($js,$view);
 	}
 

Ajax/semantic/html/content/HtmlListItem.php

Spacing +17 added lines, -17 removed lines

@@ -9,15 +9,15 @@ 
 	protected $image;
 
 	public function __construct($identifier, $content=NULL) {
-		parent::__construct($identifier,"item",$content);
+		parent::__construct($identifier, "item", $content);
 	}
-	protected function initContent($content){
-		if(\is_array($content)){
-			if(JArray::isAssociative($content)===false){
+	protected function initContent($content) {
+		if (\is_array($content)) {
+			if (JArray::isAssociative($content)===false) {
 				$icon=@$content[0];
 				$title=@$content[1];
 				$desc=@$content[2];
-			}else{
+			} else {
 				$icon=@$content["icon"];
 				$image=@$content["image"];
 				$title=@$content["title"];
@@ -25,38 +25,38 @@ 
 				$desc=@$content["description"];
 				$items=@$content["items"];
 			}
-			if(isset($icon)){
+			if (isset($icon)) {
 				$this->setIcon($icon);
 			}
-			if(isset($image)){
+			if (isset($image)) {
 				$this->setImage($image);
 			}
-			if(isset($title)){
-				$this->setTitle($title,$desc);
-			}elseif (isset($header)){
-				$this->setTitle($header,$desc,"header");
+			if (isset($title)) {
+				$this->setTitle($title, $desc);
+			}elseif (isset($header)) {
+				$this->setTitle($header, $desc, "header");
 			}
-			if(isset($items)){
+			if (isset($items)) {
 				$this->addList($items);
 			}
-		}else{
+		} else {
 			$this->setContent($content);
 		}
 	}
-	public function addList($items=array(),$ordered=false) {
+	public function addList($items=array(), $ordered=false) {
 		$list=new HtmlList("", $items);
-		if($ordered)
+		if ($ordered)
 			$list->setOrdered();
 		$list->setClass("list");
 		$this->content["list"]=$list;
 		return $list;
 	}
 
-	public function getList(){
+	public function getList() {
 		return $this->content["list"];
 	}
 
-	public function getItem($index){
+	public function getItem($index) {
 		return $this->getList()->getItem($index);
 	}
 }

Braces +6 added lines, -5 removed lines

@@ -17,7 +17,7 @@ 
 				$icon=@$content[0];
 				$title=@$content[1];
 				$desc=@$content[2];
-			}else{
+			} else{
 				$icon=@$content["icon"];
 				$image=@$content["image"];
 				$title=@$content["title"];
@@ -33,20 +33,21 @@ 
 			}
 			if(isset($title)){
 				$this->setTitle($title,$desc);
-			}elseif (isset($header)){
+			} elseif (isset($header)){
 				$this->setTitle($header,$desc,"header");
 			}
 			if(isset($items)){
 				$this->addList($items);
 			}
-		}else{
+		} else{
 			$this->setContent($content);
 		}
 	}
 	public function addList($items=array(),$ordered=false) {
 		$list=new HtmlList("", $items);
-		if($ordered)
-			$list->setOrdered();
+		if($ordered) {
+					$list->setOrdered();
+		}
 		$list->setClass("list");
 		$this->content["list"]=$list;
 		return $list;

Ajax/semantic/html/modules/HtmlPopup.php

Spacing +15 added lines, -15 removed lines

@@ -11,7 +11,7 @@ 
 
 class HtmlPopup extends HtmlSemDoubleElement {
 	private $_container;
-	public function __construct(BaseHtml $container,$identifier, $content="") {
+	public function __construct(BaseHtml $container, $identifier, $content="") {
 		parent::__construct($identifier, "div");
 		$this->_container=$container;
 		$this->setClass("ui popup");
@@ -23,9 +23,9 @@ 
 	 * {@inheritDoc}
 	 * @see \Ajax\semantic\html\base\HtmlSemDoubleElement::addList()
 	 */
-	public function addList($items=array(),$header=NULL){
-		if(!$this->content instanceof HtmlGrid){
-			$this->content=new HtmlGrid("Grid-".$this->identifier,0);
+	public function addList($items=array(), $header=NULL) {
+		if (!$this->content instanceof HtmlGrid) {
+			$this->content=new HtmlGrid("Grid-".$this->identifier, 0);
 		}
 		$grid=$this->content;
 
@@ -33,12 +33,12 @@ 
 		$colCount++;
 		$grid->setColsCount($colCount);
 
-		$list=new HtmlList("",$items);
+		$list=new HtmlList("", $items);
 		$list->asLink();
-		if(isset($header)){
-			$list->addHeader(4,$header);
+		if (isset($header)) {
+			$list->addHeader(4, $header);
 		}
-		$grid->getCell(0,$colCount-1)->setContent($list);
+		$grid->getCell(0, $colCount-1)->setContent($list);
 		$grid->setDivided()->setRelaxed(true);
 		return $list;
 	}
@@ -46,14 +46,14 @@ 
 	/**
 	 * A popup can have no maximum width and continue to flow to fit its content
 	 */
-	public function setFlowing(){
+	public function setFlowing() {
 		return $this->addToProperty("class", "flowing");
 	}
 
 	/**
 	 * A popup can provide more basic formatting
 	 */
-	public function setBasic(){
+	public function setBasic() {
 		return $this->addToProperty("class", "basic");
 	}
 
@@ -61,23 +61,23 @@ 
 	 * {@inheritDoc}
 	 * @see \Ajax\semantic\html\base\HtmlSemDoubleElement::run()
 	 */
-	public function run(JsUtils $js){
+	public function run(JsUtils $js) {
 		parent::run($js);
 		$this->_params["popup"]="#".$this->identifier;
-		$js->semantic()->popup("#".$this->_container->getIdentifier(),$this->_params);
+		$js->semantic()->popup("#".$this->_container->getIdentifier(), $this->_params);
 	}
 
-	public function setOn($event="click"){
+	public function setOn($event="click") {
 		$this->_params["on"]=$event;
 		return $this;
 	}
 
-	public function setInline($value=true){
+	public function setInline($value=true) {
 		$this->_params["inline"]=$value;
 		return $this;
 	}
 
-	public function setPosition($position){
+	public function setPosition($position) {
 		$this->_params["position"]=$position;
 		return $this;
 	}

Ajax/common/traits/JsUtilsAjaxTrait.php

Spacing +69 added lines, -69 removed lines

@@ -16,18 +16,18 @@ 
 	protected $ajaxLoader='<span></span><span></span><span></span><span></span><span></span>';
 
 	abstract public function getUrl($url);
-	abstract public function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false,$immediatly=true);
+	abstract public function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false, $immediatly=true);
 
-	protected function _ajax($method,$url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true,$jqueryDone="html",$ajaxTransition=null,$immediatly=false) {
+	protected function _ajax($method, $url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true, $jqueryDone="html", $ajaxTransition=null, $immediatly=false) {
 		$jsCallback=isset($jsCallback) ? $jsCallback : "";
 		$retour=$this->_getAjaxUrl($url, $attr);
 		$responseElement=$this->_getResponseElement($responseElement);
 		$retour.="var self=this;\n";
-		if($hasLoader===true){
+		if ($hasLoader===true) {
 			$this->addLoading($retour, $responseElement);
 		}
 		$retour.="$.".$method."(url,".self::_correctParams($params).").done(function( data ) {\n";
-		$retour.=$this->_getOnAjaxDone($responseElement, $jqueryDone,$ajaxTransition,$jsCallback)."});\n";
+		$retour.=$this->_getOnAjaxDone($responseElement, $jqueryDone, $ajaxTransition, $jsCallback)."});\n";
 		if ($immediatly)
 			$this->jquery_code_for_compile[]=$retour;
 			return $retour;
@@ -35,33 +35,33 @@ 
 
 
 
-	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 (JString::isNotNull($attr)) {
 				if ($attr==="value")
 					$retour.="url=url+'".$slash."'+$(this).val();\n";
 				elseif ($attr==="html")
 					$retour.="url=url+'".$slash."'+$(this).html();\n";
-				elseif($attr!==null && $attr!=="")
+				elseif ($attr!==null && $attr!=="")
 					$retour.="url=url+'".$slash."'+($(this).attr('".$attr."')||'');\n";
 			}
 			return $retour;
 	}
 
-	protected function _getOnAjaxDone($responseElement,$jqueryDone,$ajaxTransition,$jsCallback){
-		$retour="";$call=null;
+	protected function _getOnAjaxDone($responseElement, $jqueryDone, $ajaxTransition, $jsCallback) {
+		$retour=""; $call=null;
 		if ($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";
 		}
@@ -69,7 +69,7 @@ 
 		return $retour;
 	}
 
-	protected function _getResponseElement($responseElement){
+	protected function _getResponseElement($responseElement) {
 		if ($responseElement!=="") {
 			$responseElement=Javascript::prep_value($responseElement);
 		}
@@ -79,17 +79,17 @@ 
 	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;
@@ -107,11 +107,11 @@ 
 		$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;
@@ -131,8 +131,8 @@ 
 	 * @param string $jqueryDone the jquery function call on ajax data. default:html
 	 * @param string|callable $ajaxTransition
 	 */
-	private function _get($url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true,$jqueryDone="html",$ajaxTransition=null,$immediatly=false) {
-		return $this->_ajax("get", $url,$params,$responseElement,$jsCallback,$attr,$hasLoader,$jqueryDone,$ajaxTransition,$immediatly);
+	private function _get($url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true, $jqueryDone="html", $ajaxTransition=null, $immediatly=false) {
+		return $this->_ajax("get", $url, $params, $responseElement, $jsCallback, $attr, $hasLoader, $jqueryDone, $ajaxTransition, $immediatly);
 	}
 
 	/**
@@ -145,8 +145,8 @@ 
 	 * @param string $jqueryDone the jquery function call on ajax data. default:html
 	 * @param string|callable $ajaxTransition
 	 */
-	public function get($url, $responseElement="", $params="{}", $jsCallback=NULL,$hasLoader=true,$jqueryDone="html",$ajaxTransition=null) {
-		return $this->_get($url,$params,$responseElement,$jsCallback,null,$hasLoader,$jqueryDone,$ajaxTransition,true);
+	public function get($url, $responseElement="", $params="{}", $jsCallback=NULL, $hasLoader=true, $jqueryDone="html", $ajaxTransition=null) {
+		return $this->_get($url, $params, $responseElement, $jsCallback, null, $hasLoader, $jqueryDone, $ajaxTransition, true);
 	}
 
 	/**
@@ -160,9 +160,9 @@ 
 	 * @param string $jqueryDone the jquery function call on ajax data. default:html
 	 * @param string|callable $ajaxTransition
 	 */
-	public function ajax($method,$url, $responseElement="", $params="{}", $jsCallback=NULL,$hasLoader=true,$jqueryDone="html",$ajaxTransition=null) {
+	public function ajax($method, $url, $responseElement="", $params="{}", $jsCallback=NULL, $hasLoader=true, $jqueryDone="html", $ajaxTransition=null) {
 		$method=\strtolower($method);
-		return $this->_ajax($method,$url,$params,$responseElement,$jsCallback,null,$hasLoader,$jqueryDone,$ajaxTransition,true);
+		return $this->_ajax($method, $url, $params, $responseElement, $jsCallback, null, $hasLoader, $jqueryDone, $ajaxTransition, true);
 	}
 
 	/**
@@ -175,7 +175,7 @@ 
 	 * @param string $context
 	 * @param boolean $immediatly
 	 */
-	private function _json($url, $method="get", $params="{}", $jsCallback=NULL, $attr="id", $context="document",$immediatly=false) {
+	private function _json($url, $method="get", $params="{}", $jsCallback=NULL, $attr="id", $context="document", $immediatly=false) {
 		$jsCallback=isset($jsCallback) ? $jsCallback : "";
 		$retour=$this->_getAjaxUrl($url, $attr);
 		$retour.="$.{$method}(url,".$params.").done(function( data ) {\n";
@@ -198,8 +198,8 @@ 
 	 * @param string $context
 	 * @param boolean $immediatly
 	 */
-	public function json($url, $method="get", $params="{}", $jsCallback=NULL,$context="document",$immediatly=false) {
-		return $this->_json($url,$method,$params,$jsCallback,NULL,$context,$immediatly);
+	public function json($url, $method="get", $params="{}", $jsCallback=NULL, $context="document", $immediatly=false) {
+		return $this->_json($url, $method, $params, $jsCallback, NULL, $context, $immediatly);
 	}
 
 	/**
@@ -209,7 +209,7 @@ 
 	 * @param string $url the request address
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","params"=>"{}","method"=>"get","immediatly"=>true)
 	 */
-	public function jsonOn($event,$element, $url,$parameters=array()) {
+	public function jsonOn($event, $element, $url, $parameters=array()) {
 		$preventDefault=true;
 		$stopPropagation=true;
 		$jsCallback=null;
@@ -219,7 +219,7 @@ 
 		$params="{}";
 		$immediatly=true;
 		extract($parameters);
-		return $this->_add_event($element, $this->_json($url,$method, $params,$jsCallback, $attr,$context), $event, $preventDefault, $stopPropagation,$immediatly);
+		return $this->_add_event($element, $this->_json($url, $method, $params, $jsCallback, $attr, $context), $event, $preventDefault, $stopPropagation, $immediatly);
 	}
 
 	/**
@@ -230,8 +230,8 @@ 
 	 * @param string $jsCallback javascript code to execute after the request
 	 * @param string $context jquery DOM element, array container.
 	 */
-	public function jsonDeferred($url, $method="get", $params="{}", $jsCallback=NULL,$context=NULL) {
-		return $this->json($url, $method, $params, $jsCallback, $context,false);
+	public function jsonDeferred($url, $method="get", $params="{}", $jsCallback=NULL, $context=NULL) {
+		return $this->json($url, $method, $params, $jsCallback, $context, false);
 	}
 
 	/**
@@ -244,22 +244,22 @@ 
 	 * @param string $rowClass the css class for the new element
 	 * @param boolean $immediatly
 	 */
-	private function _jsonArray($maskSelector, $url, $method="get", $params="{}", $jsCallback=NULL,$rowClass="_json",$context=NULL,$attr="id",$immediatly=false) {
+	private function _jsonArray($maskSelector, $url, $method="get", $params="{}", $jsCallback=NULL, $rowClass="_json", $context=NULL, $attr="id", $immediatly=false) {
 		$jsCallback=isset($jsCallback) ? $jsCallback : "";
 		$retour=$this->_getAjaxUrl($url, $attr);
-		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.="var self = $(this);\n$.{$method}(url,".$params.").done(function( data ) {\n";
 		$retour.=$parent.".find('._json').remove();";
 		$retour.="\tdata=$.parseJSON(data);$.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."\n"."});\n";
@@ -278,8 +278,8 @@ 
 	 * @param string $context jquery DOM element, array container.
 	 * @param boolean $immediatly
 	 */
-	public function jsonArray($maskSelector, $url, $method="get", $params="{}", $jsCallback=NULL,$rowClass="_json",$context=NULL,$immediatly=false) {
-		return $this->_jsonArray($maskSelector, $url,$method,$params,$jsCallback,$rowClass,$context,NULL,$immediatly);
+	public function jsonArray($maskSelector, $url, $method="get", $params="{}", $jsCallback=NULL, $rowClass="_json", $context=NULL, $immediatly=false) {
+		return $this->_jsonArray($maskSelector, $url, $method, $params, $jsCallback, $rowClass, $context, NULL, $immediatly);
 	}
 
 	/**
@@ -292,8 +292,8 @@ 
 	 * @param string $rowClass the css class for the new element
 	 * @param string $context jquery DOM element, array container.
 	 */
-	public function jsonArrayDeferred($maskSelector, $url, $method="get", $params="{}", $jsCallback=NULL,$rowClass="_json",$context=NULL) {
-		return $this->jsonArray($maskSelector, $url, $method, $params, $jsCallback,$rowClass,$context,false);
+	public function jsonArrayDeferred($maskSelector, $url, $method="get", $params="{}", $jsCallback=NULL, $rowClass="_json", $context=NULL) {
+		return $this->jsonArray($maskSelector, $url, $method, $params, $jsCallback, $rowClass, $context, false);
 	}
 
 	/**
@@ -303,18 +303,18 @@ 
 	 * @param string $url the request url
 	 * @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,$parameters=array()) {
+	public function jsonArrayOn($event, $element, $maskSelector, $url, $parameters=array()) {
 		$preventDefault=true;
 		$stopPropagation=true;
 		$jsCallback=null;
 		$attr="id";
 		$method="get";
-		$context = null;
+		$context=null;
 		$params="{}";
 		$immediatly=true;
 		$rowClass="_json";
 		extract($parameters);
-		return $this->_add_event($element, $this->_jsonArray($maskSelector,$url,$method, $params,$jsCallback, $rowClass, $context,$attr), $event, $preventDefault, $stopPropagation,$immediatly);
+		return $this->_add_event($element, $this->_jsonArray($maskSelector, $url, $method, $params, $jsCallback, $rowClass, $context, $attr), $event, $preventDefault, $stopPropagation, $immediatly);
 	}
 
 	/**
@@ -328,8 +328,8 @@ 
 	 * @param string $jqueryDone the jquery function call on ajax data. default:html
 	 * @param string|callable $ajaxTransition
 	 */
-	public function getDeferred($url, $responseElement="", $params="{}", $jsCallback=NULL,$attr="id",$jqueryDone="html",$ajaxTransition=null) {
-		return $this->_get($url, $params,$responseElement,$jsCallback,$attr,false,$jqueryDone,$ajaxTransition);
+	public function getDeferred($url, $responseElement="", $params="{}", $jsCallback=NULL, $attr="id", $jqueryDone="html", $ajaxTransition=null) {
+		return $this->_get($url, $params, $responseElement, $jsCallback, $attr, false, $jqueryDone, $ajaxTransition);
 	}
 
 	/**
@@ -352,7 +352,7 @@ 
 		$ajaxTransition=null;
 		$params="{}";
 		extract($parameters);
-		return $this->_add_event($element, $this->_get($url, $params,$responseElement,$jsCallback,$attr, $hasLoader,$jqueryDone,$ajaxTransition), $event, $preventDefault, $stopPropagation,$immediatly);
+		return $this->_add_event($element, $this->_get($url, $params, $responseElement, $jsCallback, $attr, $hasLoader, $jqueryDone, $ajaxTransition), $event, $preventDefault, $stopPropagation, $immediatly);
 	}
 
 	/**
@@ -376,7 +376,7 @@ 
 		$ajaxTransition=null;
 		$params="{}";
 		extract($parameters);
-		return $this->_add_event($element, $this->_ajax($method,$url, $params,$responseElement,$jsCallback,$attr, $hasLoader,$jqueryDone,$ajaxTransition), $event, $preventDefault, $stopPropagation,$immediatly);
+		return $this->_add_event($element, $this->_ajax($method, $url, $params, $responseElement, $jsCallback, $attr, $hasLoader, $jqueryDone, $ajaxTransition), $event, $preventDefault, $stopPropagation, $immediatly);
 	}
 
 	/**
@@ -403,8 +403,8 @@ 
 		return $this->getOn("click", $element, $url, $responseElement, $parameters);
 	}
 
-	private function _post($url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true,$jqueryDone="html",$ajaxTransition=null,$immediatly=false) {
-		return $this->_ajax("post", $url,$params,$responseElement,$jsCallback,$attr,$hasLoader,$jqueryDone,$ajaxTransition,$immediatly);
+	private function _post($url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true, $jqueryDone="html", $ajaxTransition=null, $immediatly=false) {
+		return $this->_ajax("post", $url, $params, $responseElement, $jsCallback, $attr, $hasLoader, $jqueryDone, $ajaxTransition, $immediatly);
 	}
 
 	/**
@@ -417,8 +417,8 @@ 
 	 * @param string $jqueryDone the jquery function call on ajax data. default:html
 	 * @param string|callable $ajaxTransition
 	 */
-	public function post($url, $responseElement="", $params="{}", $jsCallback=NULL,$hasLoader=true,$jqueryDone="html",$ajaxTransition=null) {
-		return $this->_post($url, $params, $responseElement, $jsCallback, NULL, $hasLoader,$jqueryDone,$ajaxTransition,true);
+	public function post($url, $responseElement="", $params="{}", $jsCallback=NULL, $hasLoader=true, $jqueryDone="html", $ajaxTransition=null) {
+		return $this->_post($url, $params, $responseElement, $jsCallback, NULL, $hasLoader, $jqueryDone, $ajaxTransition, true);
 	}
 
 	/**
@@ -433,8 +433,8 @@ 
 	 * @param string $jqueryDone the jquery function call on ajax data. default:html
 	 * @param string|callable $ajaxTransition
 	 */
-	public function postDeferred($url, $responseElement="", $params="{}", $jsCallback=NULL, $attr="id",$hasLoader=true,$jqueryDone="html",$ajaxTransition=null) {
-		return $this->_post($url, $params, $responseElement, $jsCallback, $attr, $hasLoader,$jqueryDone,$ajaxTransition,false);
+	public function postDeferred($url, $responseElement="", $params="{}", $jsCallback=NULL, $attr="id", $hasLoader=true, $jqueryDone="html", $ajaxTransition=null) {
+		return $this->_post($url, $params, $responseElement, $jsCallback, $attr, $hasLoader, $jqueryDone, $ajaxTransition, false);
 	}
 
 	/**
@@ -457,7 +457,7 @@ 
 		$jqueryDone="html";
 		$ajaxTransition=null;
 		extract($parameters);
-		return $this->_add_event($element, $this->_post($url, $params, $responseElement, $jsCallback, $attr,$hasLoader,$jqueryDone,$ajaxTransition), $event, $preventDefault, $stopPropagation,$immediatly);
+		return $this->_add_event($element, $this->_post($url, $params, $responseElement, $jsCallback, $attr, $hasLoader, $jqueryDone, $ajaxTransition), $event, $preventDefault, $stopPropagation, $immediatly);
 	}
 
 	/**
@@ -473,20 +473,20 @@ 
 		return $this->postOn("click", $element, $url, $params, $responseElement, $parameters);
 	}
 
-	private function _postForm($url, $form, $responseElement, $params=null,$validation=false, $jsCallback=NULL, $attr="id", $hasLoader=true,$jqueryDone="html",$ajaxTransition=null,$immediatly=false) {
+	private function _postForm($url, $form, $responseElement, $params=null, $validation=false, $jsCallback=NULL, $attr="id", $hasLoader=true, $jqueryDone="html", $ajaxTransition=null, $immediatly=false) {
 		$jsCallback=isset($jsCallback) ? $jsCallback : "";
 		$retour=$this->_getAjaxUrl($url, $attr);
 		$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){
+		if ($hasLoader===true) {
 			$this->addLoading($retour, $responseElement);
 		}
 		$retour.="$.post(url,params).done(function( data ) {\n";
-		$retour.=$this->_getOnAjaxDone($responseElement, $jqueryDone,$ajaxTransition,$jsCallback)."});\n";
+		$retour.=$this->_getOnAjaxDone($responseElement, $jqueryDone, $ajaxTransition, $jsCallback)."});\n";
 
 		if ($validation) {
 			$retour="$('#".$form."').validate({submitHandler: function(form) {
@@ -510,8 +510,8 @@ 
 	 * @param string $jqueryDone the jquery function call on ajax data. default:html
 	 * @param string|callable $ajaxTransition
 	 */
-	public function postForm($url, $form, $responseElement, $params=NULL,$validation=false, $jsCallback=NULL,$hasLoader=true,$jqueryDone="html",$ajaxTransition=null) {
-		return $this->_postForm($url, $form, $responseElement, $params,$validation, $jsCallback, NULL, $hasLoader,$jqueryDone,$ajaxTransition,true);
+	public function postForm($url, $form, $responseElement, $params=NULL, $validation=false, $jsCallback=NULL, $hasLoader=true, $jqueryDone="html", $ajaxTransition=null) {
+		return $this->_postForm($url, $form, $responseElement, $params, $validation, $jsCallback, NULL, $hasLoader, $jqueryDone, $ajaxTransition, true);
 	}
 
 	/**
@@ -528,8 +528,8 @@ 
 	 * @param string $jqueryDone the jquery function call on ajax data. default:html
 	 * @param string|callable $ajaxTransition
 	 */
-	public function postFormDeferred($url, $form, $responseElement, $params=NULL,$validation=false, $jsCallback=NULL,$attr="id",$hasLoader=true,$jqueryDone="html",$ajaxTransition=null) {
-		return $this->_postForm($url, $form, $responseElement, $params,$validation, $jsCallback, $attr, $hasLoader,$jqueryDone,$ajaxTransition,false);
+	public function postFormDeferred($url, $form, $responseElement, $params=NULL, $validation=false, $jsCallback=NULL, $attr="id", $hasLoader=true, $jqueryDone="html", $ajaxTransition=null) {
+		return $this->_postForm($url, $form, $responseElement, $params, $validation, $jsCallback, $attr, $hasLoader, $jqueryDone, $ajaxTransition, false);
 	}
 
 	/**
@@ -554,7 +554,7 @@ 
 		$jqueryDone="html";
 		$ajaxTransition=null;
 		extract($parameters);
-		return $this->_add_event($element, $this->_postForm($url, $form, $responseElement,$params, $validation, $jsCallback, $attr,$hasLoader,$jqueryDone,$ajaxTransition), $event, $preventDefault, $stopPropagation,$immediatly);
+		return $this->_add_event($element, $this->_postForm($url, $form, $responseElement, $params, $validation, $jsCallback, $attr, $hasLoader, $jqueryDone, $ajaxTransition), $event, $preventDefault, $stopPropagation, $immediatly);
 	}
 
 	/**

Braces +32 added lines, -24 removed lines

@@ -28,8 +28,9 @@ 
 		}
 		$retour.="$.".$method."(url,".self::_correctParams($params).").done(function( data ) {\n";
 		$retour.=$this->_getOnAjaxDone($responseElement, $jqueryDone,$ajaxTransition,$jsCallback)."});\n";
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$retour;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$retour;
+		}
 			return $retour;
 	}
 
@@ -39,15 +40,17 @@ 
 		$url=$this->_correctAjaxUrl($url);
 		$retour="url='".$url."';";
 		$slash="/";
-		if(JString::endswith($url, "/")===true)
-			$slash="";
+		if(JString::endswith($url, "/")===true) {
+					$slash="";
+		}
 			if(JString::isNotNull($attr)){
-				if ($attr==="value")
-					$retour.="url=url+'".$slash."'+$(this).val();\n";
-				elseif ($attr==="html")
-					$retour.="url=url+'".$slash."'+$(this).html();\n";
-				elseif($attr!==null && $attr!=="")
-					$retour.="url=url+'".$slash."'+($(this).attr('".$attr."')||'');\n";
+				if ($attr==="value") {
+									$retour.="url=url+'".$slash."'+$(this).val();\n";
+				} elseif ($attr==="html") {
+									$retour.="url=url+'".$slash."'+$(this).html();\n";
+				} elseif($attr!==null && $attr!=="") {
+									$retour.="url=url+'".$slash."'+($(this).attr('".$attr."')||'');\n";
+				}
 			}
 			return $retour;
 	}
@@ -57,13 +60,14 @@ 
 		if ($responseElement!=="") {
 			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";
-				else
-					$retour="\t$({$responseElement}).{$jqueryDone}( data );\n";
+			if(\is_callable($call)) {
+							$retour="\t".$call($responseElement,$jqueryDone).";\n";
+			} else {
+									$retour="\t$({$responseElement}).{$jqueryDone}( data );\n";
+				}
 		}
 		$retour.="\t".$jsCallback."\n";
 		return $retour;
@@ -77,8 +81,9 @@ 
 	}
 
 	protected function _correctAjaxUrl($url) {
-		if ($url!=="/" && JString::endsWith($url, "/")===true)
-			$url=substr($url, 0, strlen($url)-1);
+		if ($url!=="/" && JString::endsWith($url, "/")===true) {
+					$url=substr($url, 0, strlen($url)-1);
+		}
 			if (strncmp($url, 'http://', 7)!=0&&strncmp($url, 'https://', 8)!=0) {
 				$url=$this->getUrl($url);
 			}
@@ -184,8 +189,9 @@ 
 				$retour.="\t".$jsCallback."\n".
 						"\t$(document).trigger('jsonReady',[data]);\n".
 						"});\n";
-				if ($immediatly)
-					$this->jquery_code_for_compile[]=$retour;
+				if ($immediatly) {
+									$this->jquery_code_for_compile[]=$retour;
+				}
 		return $retour;
 	}
 
@@ -250,7 +256,7 @@ 
 		if($context===null){
 			$parent="$('".$maskSelector."').parent()";
 			$newElm = "$('#'+newId)";
-		}else{
+		} else{
 			$parent=$context;
 			$newElm = $context.".find('#'+newId)";
 		}
@@ -263,8 +269,9 @@ 
 		$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."\n"."});\n";
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$retour;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$retour;
+		}
 		return $retour;
 	}
 
@@ -494,8 +501,9 @@ 
 			}});\n";
 			$retour.="$('#".$form."').submit();\n";
 		}
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$retour;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$retour;
+		}
 		return $retour;
 	}