phpMv / phpMv-UI

Ajax/semantic/widgets/base/FieldAsTrait.php

Spacing +115 added lines, -115 removed lines

@@ -29,23 +29,23 @@ 
  * @property boolean $_edition
  * @property mixed _modelInstance
  */
-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){
-		if(isset($attributes["jsCallback"])){
+	protected function _applyAttributes(BaseHtml $element, &$attributes, $index) {
+		if (isset($attributes["jsCallback"])) {
 			$callback=$attributes["jsCallback"];
-			if(\is_callable($callback)){
-				$callback($element,$this->_modelInstance,$index);
+			if (\is_callable($callback)) {
+				$callback($element, $this->_modelInstance, $index);
 				unset($attributes["jsCallback"]);
 			}
 		}
@@ -55,43 +55,43 @@ 
 		$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"])) {
 			$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) use (&$attributes,$elementCallback,$prefix){
+	protected function _fieldAs($elementCallback, &$index, $attributes=NULL, $prefix=null) {
+		$this->setValueFunction($index, function($value, $instance, $index) 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);
+			$element=$elementCallback($id, $name, $value, $caption);
+			if (\is_array($attributes)) {
+				$this->_applyAttributes($element, $attributes, $index);
 			}
 			$element->setDisabled(!$this->_edition);
 			return $element;
@@ -100,188 +100,188 @@ 
 	}
 
 
-	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 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 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";
-		return $this->fieldAsInput($index,$attributes);
+		return $this->fieldAsInput($index, $attributes);
 	}
 
-	public function fieldAsCheckbox($index,$attributes=NULL){
-		return $this->_fieldAs(function($id,$name,$value,$caption) use($attributes){
-			if($caption===null || $caption==="")
+	public function fieldAsCheckbox($index, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) use($attributes){
+			if ($caption===null || $caption==="")
 				$caption="";
-			$input=new HtmlFormCheckbox($id,$caption,$this->_instanceViewer->getIdentifier());
+			$input=new HtmlFormCheckbox($id, $caption, $this->_instanceViewer->getIdentifier());
 			$input->setChecked(JString::isBooleanTrue($value));
 			return $this->_prepareFormFields($input, $name, $attributes);
-		}, $index,$attributes,"ck");
+		}, $index, $attributes, "ck");
 	}
 
-	public function fieldAsDropDown($index,$elements=[],$multiple=false,$attributes=NULL){
-		return $this->_fieldAs(function($id,$name,$value,$caption) use($elements,$multiple,$attributes){
-			$dd=new HtmlFormDropdown($id,$elements,$caption,$value);
-			$dd->asSelect($name,$multiple);
+	public function fieldAsDropDown($index, $elements=[], $multiple=false, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) use($elements, $multiple, $attributes){
+			$dd=new HtmlFormDropdown($id, $elements, $caption, $value);
+			$dd->asSelect($name, $multiple);
 			return $this->_prepareFormFields($dd, $name, $attributes);
-		}, $index,$attributes,"dd");
+		}, $index, $attributes, "dd");
 	}
 
-	public function fieldAsMessage($index,$attributes=NULL){
-		return $this->_fieldAs(function($id,$name,$value,$caption){
-			$mess= new HtmlMessage("message-".$id,$caption);
+	public function fieldAsMessage($index, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) {
+			$mess=new HtmlMessage("message-".$id, $caption);
 			$mess->addHeader($value);
 			return $mess;
-		}, $index,$attributes,"message");
+		}, $index, $attributes, "message");
 	}
 
-	public function fieldAsLink($index,$attributes=NULL){
-		return $this->_fieldAs(function($id,$name,$value,$caption){
-			$lnk= new HtmlLink("message-".$id,"#",$caption);
+	public function fieldAsLink($index, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) {
+			$lnk=new HtmlLink("message-".$id, "#", $caption);
 			return $lnk;
-		}, $index,$attributes,"link");
+		}, $index, $attributes, "link");
 	}
 
 	/**Change fields type
 	 * @param array $types an array or associative array $type=>$attributes
 	 */
-	public function fieldsAs(array $types){
+	public function fieldsAs(array $types) {
 		$i=0;
-		if(JArray::isAssociative($types)){
-			foreach ($types as $type=>$attributes){
-				if(\is_int($type))
-					$this->fieldAs($i++,$attributes,[]);
-				else{
-					$type=preg_replace('/\d/', '', $type );
-					$this->fieldAs($i++,$type,$attributes);
+		if (JArray::isAssociative($types)) {
+			foreach ($types as $type=>$attributes) {
+				if (\is_int($type))
+					$this->fieldAs($i++, $attributes, []);
+				else {
+					$type=preg_replace('/\d/', '', $type);
+					$this->fieldAs($i++, $type, $attributes);
 				}
 			}
-		}else{
-			foreach ($types as $type){
-				$this->fieldAs($i++,$type);
+		} else {
+			foreach ($types as $type) {
+				$this->fieldAs($i++, $type);
 			}
 		}
 	}
 
-	public function fieldAs($index,$type,$attributes=NULL){
+	public function fieldAs($index, $type, $attributes=NULL) {
 		$method="fieldAs".\ucfirst($type);
-		if(\method_exists($this, $method)){
-			if(!\is_array($attributes)){
+		if (\method_exists($this, $method)) {
+			if (!\is_array($attributes)) {
 				$attributes=[$index];
-			}else{
+			} else {
 				\array_unshift($attributes, $index);
 			}
-			\call_user_func_array([$this,$method], $attributes);
+			\call_user_func_array([$this, $method], $attributes);
 		}
 	}
 
-	public function fieldAsSubmit($index,$cssStyle=NULL,$url=NULL,$responseElement=NULL,$attributes=NULL){
-		return $this->_fieldAs(function($id,$name,$value,$caption) use ($url,$responseElement,$cssStyle,$attributes){
-			$button=new HtmlButton($id,$caption,$cssStyle);
-			$this->_buttonAsSubmit($button,"click",$url,$responseElement,@$attributes["ajax"]);
+	public function fieldAsSubmit($index, $cssStyle=NULL, $url=NULL, $responseElement=NULL, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) use ($url, $responseElement, $cssStyle, $attributes){
+			$button=new HtmlButton($id, $caption, $cssStyle);
+			$this->_buttonAsSubmit($button, "click", $url, $responseElement, @$attributes["ajax"]);
 			return $button;
-		}, $index,$attributes,"submit");
+		}, $index, $attributes, "submit");
 	}
 
-	public function fieldAsButton($index,$cssStyle=NULL,$attributes=NULL){
-		return $this->_fieldAs(function($id,$name,$value,$caption) use ($cssStyle){
-			$button=new HtmlButton($id,$value,$cssStyle);
+	public function fieldAsButton($index, $cssStyle=NULL, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) use ($cssStyle){
+			$button=new HtmlButton($id, $value, $cssStyle);
 			return $button;
-		}, $index,$attributes,"button");
+		}, $index, $attributes, "button");
 	}
 }

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

Spacing +33 added lines, -33 removed lines

@@ -19,46 +19,46 @@ 
  * @property string $identifier
  */
 trait FieldsTrait {
-	abstract public function addFields($fields=NULL,$label=NULL);
+	abstract public function addFields($fields=NULL, $label=NULL);
 	abstract public function addItem($item);
 
-	protected function createItem($value){
-		if(\is_array($value)){
-			$itemO=new HtmlFormInput(JArray::getDefaultValue($value, "id",""),JArray::getDefaultValue($value, "label",null),JArray::getDefaultValue($value, "type", "text"),JArray::getDefaultValue($value, "value",""),JArray::getDefaultValue($value, "placeholder",JArray::getDefaultValue($value, "label",null)));
+	protected function createItem($value) {
+		if (\is_array($value)) {
+			$itemO=new HtmlFormInput(JArray::getDefaultValue($value, "id", ""), JArray::getDefaultValue($value, "label", null), JArray::getDefaultValue($value, "type", "text"), JArray::getDefaultValue($value, "value", ""), JArray::getDefaultValue($value, "placeholder", JArray::getDefaultValue($value, "label", null)));
 			return $itemO;
-		}elseif(\is_object($value)){
+		}elseif (\is_object($value)) {
 			$itemO=new HtmlFormField("field-".$this->identifier, $value);
 			return $itemO;
-		}else
+		} else
 			return new HtmlFormInput($value);
 	}
 
-	protected function createCondition($value){
+	protected function createCondition($value) {
 		return \is_object($value)===false || $value instanceof \Ajax\semantic\html\elements\HtmlInput;
 	}
 
-	public function addInputs($inputs,$fieldslabel=null){
+	public function addInputs($inputs, $fieldslabel=null) {
 		$fields=array();
-		foreach ($inputs as $input){
+		foreach ($inputs as $input) {
 			\extract($input);
-			$f=new HtmlFormInput("","");
+			$f=new HtmlFormInput("", "");
 			$f->fromArray($input);
 			$fields[]=$f;
 		}
-		return $this->addFields($fields,$fieldslabel);
+		return $this->addFields($fields, $fieldslabel);
 	}
 
-	public function addFieldRule($index,$type,$prompt=NULL,$value=NULL){
+	public function addFieldRule($index, $type, $prompt=NULL, $value=NULL) {
 		$field=$this->getItem($index);
-		if(isset($field)){
-			$field->addRule($type,$prompt,$value);
+		if (isset($field)) {
+			$field->addRule($type, $prompt, $value);
 		}
 		return $this;
 	}
 
-	public function addFieldRules($index,$rules){
+	public function addFieldRules($index, $rules) {
 		$field=$this->getItem($index);
-		if(isset($field)){
+		if (isset($field)) {
 			$field->addRules($rules);
 		}
 		return $this;
@@ -72,8 +72,8 @@ 
 	 * @param boolean $multiple
 	 * @return HtmlDoubleElement
 	 */
-	public function addDropdown($identifier,$items=array(), $label=NULL,$value=NULL,$multiple=false){
-		return $this->addItem(new HtmlFormDropdown($identifier,$items,$label,$value,$multiple));
+	public function addDropdown($identifier, $items=array(), $label=NULL, $value=NULL, $multiple=false) {
+		return $this->addItem(new HtmlFormDropdown($identifier, $items, $label, $value, $multiple));
 	}
 
 	/**
@@ -84,8 +84,8 @@ 
 	 * @param string $placeholder
 	 * @return HtmlFormInput
 	 */
-	public function addInput($identifier, $label=NULL,$type="text",$value=NULL,$placeholder=NULL){
-		return $this->addItem(new HtmlFormInput($identifier,$label,$type,$value,$placeholder));
+	public function addInput($identifier, $label=NULL, $type="text", $value=NULL, $placeholder=NULL) {
+		return $this->addItem(new HtmlFormInput($identifier, $label, $type, $value, $placeholder));
 	}
 
 	/**
@@ -96,28 +96,28 @@ 
 	 * @param int $rows
 	 * @return HtmlTextarea
 	 */
-	public function addTextarea($identifier, $label,$value=NULL,$placeholder=NULL,$rows=5){
-		return $this->addItem(new HtmlFormTextarea($identifier,$label,$value,$placeholder,$rows));
+	public function addTextarea($identifier, $label, $value=NULL, $placeholder=NULL, $rows=5) {
+		return $this->addItem(new HtmlFormTextarea($identifier, $label, $value, $placeholder, $rows));
 	}
 
-	public function addPassword($identifier, $label=NULL){
-		return $this->addItem(new HtmlFormInput($identifier,$label,"password","",""));
+	public function addPassword($identifier, $label=NULL) {
+		return $this->addItem(new HtmlFormInput($identifier, $label, "password", "", ""));
 	}
 
-	public function addButton($identifier,$value,$cssStyle=NULL,$onClick=NULL){
-		return $this->addItem(new HtmlButton($identifier,$value,$cssStyle,$onClick));
+	public function addButton($identifier, $value, $cssStyle=NULL, $onClick=NULL) {
+		return $this->addItem(new HtmlButton($identifier, $value, $cssStyle, $onClick));
 	}
 
-	public function addCheckbox($identifier, $label=NULL,$value=NULL,$type=NULL){
-		return $this->addItem(new HtmlFormCheckbox($identifier,$label,$value,$type));
+	public function addCheckbox($identifier, $label=NULL, $value=NULL, $type=NULL) {
+		return $this->addItem(new HtmlFormCheckbox($identifier, $label, $value, $type));
 	}
 
-	public function addRadio($identifier, $name,$label=NULL,$value=NULL){
-		return $this->addItem(new HtmlFormRadio($identifier,$name,$label,$value));
+	public function addRadio($identifier, $name, $label=NULL, $value=NULL) {
+		return $this->addItem(new HtmlFormRadio($identifier, $name, $label, $value));
 	}
 
-	public function addElement($identifier,$content,$label,$tagName="div",$baseClass=""){
-		$div=new HtmlSemDoubleElement($identifier,$tagName,$baseClass,$content);
-		return $this->addItem(new HtmlFormField("field-".$identifier, $div,$label));
+	public function addElement($identifier, $content, $label, $tagName="div", $baseClass="") {
+		$div=new HtmlSemDoubleElement($identifier, $tagName, $baseClass, $content);
+		return $this->addItem(new HtmlFormField("field-".$identifier, $div, $label));
 	}
 }

Ajax/common/traits/JsUtilsAjaxTrait.php

Spacing +64 added lines, -64 removed lines

@@ -16,19 +16,19 @@ 
 	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) {
-		if(JString::isNull($params)){$params="{}";}
+	protected function _ajax($method, $url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true, $jqueryDone="html", $ajaxTransition=null, $immediatly=false) {
+		if (JString::isNull($params)) {$params="{}"; }
 		$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,".$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;
@@ -36,33 +36,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";
 		}
@@ -70,7 +70,7 @@ 
 		return $retour;
 	}
 
-	protected function _getResponseElement($responseElement){
+	protected function _getResponseElement($responseElement) {
 		if ($responseElement!=="") {
 			$responseElement=Javascript::prep_value($responseElement);
 		}
@@ -80,7 +80,7 @@ 
 	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;
@@ -98,11 +98,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;
@@ -122,8 +122,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);
 	}
 
 	/**
@@ -136,8 +136,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);
 	}
 
 	/**
@@ -150,7 +150,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";
@@ -173,8 +173,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);
 	}
 
 	/**
@@ -184,7 +184,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;
@@ -194,7 +194,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);
 	}
 
 	/**
@@ -205,8 +205,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);
 	}
 
 	/**
@@ -219,22 +219,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";
@@ -253,8 +253,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);
 	}
 
 	/**
@@ -267,8 +267,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);
 	}
 
 	/**
@@ -278,18 +278,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);
 	}
 
 	/**
@@ -303,8 +303,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);
 	}
 
 	/**
@@ -327,7 +327,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);
 	}
 
 	/**
@@ -342,8 +342,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);
 	}
 
 	/**
@@ -356,8 +356,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);
 	}
 
 	/**
@@ -372,8 +372,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);
 	}
 
 	/**
@@ -396,7 +396,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);
 	}
 
 	/**
@@ -412,20 +412,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+='&'+$.param(".$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) {
@@ -449,8 +449,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);
 	}
 
 	/**
@@ -467,8 +467,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);
 	}
 
 	/**
@@ -493,7 +493,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);
 	}
 
 	/**

Ajax/service/AjaxCall.php

Spacing +7 added lines, -7 removed lines

@@ -29,27 +29,27 @@
 		$rowClass="_json";
 		extract($this->parameters);
 		$result=$this->_eventPreparing($preventDefault, $stopPropagation);
-		switch($this->method) {
+		switch ($this->method) {
 			case "get":
-				$result.=$js->getDeferred($url, $responseElement, $params, $jsCallback, $attr,$jqueryDone,$ajaxTransition);
+				$result.=$js->getDeferred($url, $responseElement, $params, $jsCallback, $attr, $jqueryDone, $ajaxTransition);
 				break;
 			case "post":
-				$result.=$js->postDeferred($url, $responseElement, $params, $jsCallback, $attr,$hasLoader,$jqueryDone,$ajaxTransition);
+				$result.=$js->postDeferred($url, $responseElement, $params, $jsCallback, $attr, $hasLoader, $jqueryDone, $ajaxTransition);
 				break;
 			case "postForm":
-				$result.=$js->postFormDeferred($url, $form, $responseElement, $params,$validation, $jsCallback, $attr,$hasLoader,$jqueryDone,$ajaxTransition);
+				$result.=$js->postFormDeferred($url, $form, $responseElement, $params, $validation, $jsCallback, $attr, $hasLoader, $jqueryDone, $ajaxTransition);
 				break;
 			case "json":
-				$result.=$js->jsonDeferred($url,$method,$params,$jsCallback);
+				$result.=$js->jsonDeferred($url, $method, $params, $jsCallback);
 				break;
 			case "jsonArray":
-				$result.=$js->jsonArrayDeferred($modelSelector, $url,$method,$params,$jsCallback,$rowClass);
+				$result.=$js->jsonArrayDeferred($modelSelector, $url, $method, $params, $jsCallback, $rowClass);
 				break;
 		}
 		return $result;
 	}
 
-	protected function _eventPreparing($preventDefault,$stopPropagation){
+	protected function _eventPreparing($preventDefault, $stopPropagation) {
 		$result="";
 		if ($preventDefault===true) {
 			$result.=Javascript::$preventDefault;