phpMv / phpMv-UI

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

Spacing +26 added lines, -26 removed lines

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

Ajax/semantic/html/modules/HtmlDropdown.php

Spacing +99 added lines, -99 removed lines

@@ -13,29 +13,29 @@ 
 use Ajax\semantic\html\collections\form\traits\FieldTrait;
 
 class HtmlDropdown extends HtmlSemDoubleElement {
-	use FieldTrait,LabeledIconTrait {
+	use FieldTrait, LabeledIconTrait {
 		addIcon as addIconP;
 	}
 	protected $mClass="menu";
 	protected $mTagName="div";
-	protected $items=array ();
-	protected $_params=array("action"=>"nothing","on"=>"hover","showOnFocus"=>false);
+	protected $items=array();
+	protected $_params=array("action"=>"nothing", "on"=>"hover", "showOnFocus"=>false);
 	protected $input;
 	protected $value;
 	protected $_associative;
 	protected $_multiple;
 
-	public function __construct($identifier, $value="", $items=array(),$associative=true) {
+	public function __construct($identifier, $value="", $items=array(), $associative=true) {
 		parent::__construct($identifier, "div");
 		$this->_template=include dirname(__FILE__).'/../templates/tplDropdown.php';
 		$this->setProperty("class", "ui dropdown");
 		$this->_multiple=false;
 		$content=[];
-		if(isset($value)){
-			if($value instanceof HtmlSemDoubleElement){
+		if (isset($value)) {
+			if ($value instanceof HtmlSemDoubleElement) {
 				$text=$value;
-			}else{
-				$text=new HtmlSemDoubleElement("text-".$this->identifier,"div");
+			} else {
+				$text=new HtmlSemDoubleElement("text-".$this->identifier, "div");
 				$text->setClass("text");
 				$this->setValue($value);
 			}
@@ -48,29 +48,29 @@ 
 		$this->addItems($items);
 	}
 
-	public function getField(){
+	public function getField() {
 		return $this->input;
 	}
 
-	public function getDataField(){
+	public function getDataField() {
 		return $this->input;
 	}
 
-	public function addItem($item,$value=NULL,$image=NULL,$description=NULL){
-		$itemO=$this->beforeAddItem($item,$value,$image,$description);
+	public function addItem($item, $value=NULL, $image=NULL, $description=NULL) {
+		$itemO=$this->beforeAddItem($item, $value, $image, $description);
 		$this->items[]=$itemO;
 		return $itemO;
 	}
 
-	public function addIcon($icon,$before=true,$labeled=false){
+	public function addIcon($icon, $before=true, $labeled=false) {
 		$this->removeArrow();
-		$this->addIconP($icon,$before,$labeled);
+		$this->addIconP($icon, $before, $labeled);
 		return $this->getElementById("text-".$this->identifier, $this->content)->setWrapAfter("");
 	}
 
-	public function addIcons($icons){
+	public function addIcons($icons) {
 		$count=$this->count();
-		for ($i=0;$i<\sizeof($icons) && $i<$count;$i++){
+		for ($i=0; $i<\sizeof($icons) && $i<$count; $i++) {
 			$this->getItem($i)->addIcon($icons[$i]);
 		}
 	}
@@ -81,33 +81,33 @@ 
 	 * @param number $position
 	 * @return \Ajax\semantic\html\content\HtmlDropdownItem|unknown
 	 */
-	public function insertItem($item,$position=0){
+	public function insertItem($item, $position=0) {
 		$itemO=$this->beforeAddItem($item);
-		 $start = array_slice($this->items, 0, $position);
-		 $end = array_slice($this->items, $position);
-		 $start[] = $item;
+		 $start=array_slice($this->items, 0, $position);
+		 $end=array_slice($this->items, $position);
+		 $start[]=$item;
 		 $this->items=array_merge($start, $end);
 		 return $itemO;
 	}
 
-	protected function removeArrow(){
-		if(\sizeof($this->content)>1){
+	protected function removeArrow() {
+		if (\sizeof($this->content)>1) {
 			unset($this->content["arrow"]);
 			$this->content=\array_values($this->content);
 		}
 	}
 
-	protected function beforeAddItem($item,$value=NULL,$image=NULL,$description=NULL){
+	protected function beforeAddItem($item, $value=NULL, $image=NULL, $description=NULL) {
 		$itemO=$item;
-		if(\is_array($item)){
+		if (\is_array($item)) {
 			$description=JArray::getValue($item, "description", 3);
 			$value=JArray::getValue($item, "value", 1);
 			$image=JArray::getValue($item, "image", 2);
 			$item=JArray::getValue($item, "item", 0);
 		}
-		if(!$item instanceof HtmlDropdownItem){
-			$itemO=new HtmlDropdownItem("dd-item-".$this->identifier."-".\sizeof($this->items),$item,$value,$image,$description);
-		}elseif($itemO instanceof HtmlDropdownItem){
+		if (!$item instanceof HtmlDropdownItem) {
+			$itemO=new HtmlDropdownItem("dd-item-".$this->identifier."-".\sizeof($this->items), $item, $value, $image, $description);
+		}elseif ($itemO instanceof HtmlDropdownItem) {
 			$this->addToProperty("class", "vertical");
 		}
 		return $itemO;
@@ -120,11 +120,11 @@ 
 		$this->addItem($function($object));
 	}
 
-	public function addInput($name){
-		if(!isset($name))
+	public function addInput($name) {
+		if (!isset($name))
 			$name="input-".$this->identifier;
 		$this->setAction("activate");
-		$this->input=new HtmlInput($name,"hidden");
+		$this->input=new HtmlInput($name, "hidden");
 	}
 
 	/**
@@ -133,15 +133,15 @@ 
 	 * @param string $icon
 	 * @return \Ajax\semantic\html\content\HtmlDropdownItem
 	 */
-	public function addSearchInputItem($placeHolder=NULL,$icon=NULL){
-		return $this->addItem(HtmlDropdownItem::searchInput($placeHolder,$icon));
+	public function addSearchInputItem($placeHolder=NULL, $icon=NULL) {
+		return $this->addItem(HtmlDropdownItem::searchInput($placeHolder, $icon));
 	}
 
 	/**
 	 * Adds a divider item
 	 * @return \Ajax\semantic\html\content\HtmlDropdownItem
 	 */
-	public function addDividerItem(){
+	public function addDividerItem() {
 		return $this->addItem(HtmlDropdownItem::divider());
 	}
 
@@ -151,8 +151,8 @@ 
 	 * @param string $icon
 	 * @return \Ajax\semantic\html\content\HtmlDropdownItem|unknown
 	 */
-	public function addHeaderItem($caption=NULL,$icon=NULL){
-		return $this->addItem(HtmlDropdownItem::header($caption,$icon));
+	public function addHeaderItem($caption=NULL, $icon=NULL) {
+		return $this->addItem(HtmlDropdownItem::header($caption, $icon));
 	}
 
 	/**
@@ -161,7 +161,7 @@ 
 	 * @param string $color
 	 * @return \Ajax\semantic\html\content\HtmlDropdownItem|unknown
 	 */
-	public function addCircularLabelItem($caption,$color){
+	public function addCircularLabelItem($caption, $color) {
 		return $this->addItem(HtmlDropdownItem::circular($caption, $color));
 	}
 
@@ -170,17 +170,17 @@ 
 	 * @param string $image
 	 * @return \Ajax\semantic\html\content\HtmlDropdownItem
 	 */
-	public function addMiniAvatarImageItem($caption,$image){
+	public function addMiniAvatarImageItem($caption, $image) {
 		return $this->addItem(HtmlDropdownItem::avatar($caption, $image));
 	}
 
-	public function addItems($items){
-		if(\is_array($items) && $this->_associative){
-			foreach ($items as $k=>$v){
+	public function addItems($items) {
+		if (\is_array($items) && $this->_associative) {
+			foreach ($items as $k=>$v) {
 				$this->addItem($v)->setData($k);
 			}
-		}else{
-			foreach ($items as $item){
+		} else {
+			foreach ($items as $item) {
 				$this->addItem($item);
 			}
 		}
@@ -192,98 +192,98 @@ 
 	 * @param array $values
 	 * @return HtmlCollection
 	 */
-	public function setPropertyValues($property,$values){
+	public function setPropertyValues($property, $values) {
 		$i=0;
-		if(\is_array($values)===false){
-			$values=\array_fill(0, $this->count(),$values);
+		if (\is_array($values)===false) {
+			$values=\array_fill(0, $this->count(), $values);
 		}
-		foreach ($values as $value){
+		foreach ($values as $value) {
 			$c=$this->items[$i++];
-			if(isset($c)){
-				$c->setProperty($property,$value);
+			if (isset($c)) {
+				$c->setProperty($property, $value);
 			}
-			else{
+			else {
 				return $this;
 			}
 		}
 		return $this;
 	}
 
-	public function each($callBack){
-		foreach ($this->items as $index=>$value){
-			$callBack($index,$value);
+	public function each($callBack) {
+		foreach ($this->items as $index=>$value) {
+			$callBack($index, $value);
 		}
 		return $this;
 	}
 
-	public function getItem($index){
+	public function getItem($index) {
 		return $this->items[$index];
 	}
 
 	/**
 	 * @return int
 	 */
-	public function count(){
+	public function count() {
 		return \sizeof($this->items);
 	}
 	/**
 	 * @param boolean $dropdown
 	 */
-	public function asDropdown($dropdown){
-		if($dropdown===false){
+	public function asDropdown($dropdown) {
+		if ($dropdown===false) {
 			$this->_template=include dirname(__FILE__).'/../templates/tplDropdownMenu.php';
 			$dropdown="menu";
-		}else{
+		} else {
 			$dropdown="dropdown";
 			$this->mClass="menu";
 		}
-		return $this->addToPropertyCtrl("class", $dropdown,array("menu","dropdown"));
+		return $this->addToPropertyCtrl("class", $dropdown, array("menu", "dropdown"));
 	}
 
-	public function setVertical(){
-		return $this->addToPropertyCtrl("class", "vertical",array("vertical"));
+	public function setVertical() {
+		return $this->addToPropertyCtrl("class", "vertical", array("vertical"));
 	}
 
-	public function setInline(){
-		return $this->addToPropertyCtrl("class", "inline",["inline"]);
+	public function setInline() {
+		return $this->addToPropertyCtrl("class", "inline", ["inline"]);
 	}
 
-	public function setSimple(){
-		return $this->addToPropertyCtrl("class", "simple",array("simple"));
+	public function setSimple() {
+		return $this->addToPropertyCtrl("class", "simple", array("simple"));
 	}
 
-	public function asButton($floating=false){
+	public function asButton($floating=false) {
 		$this->removeArrow();
-		if($floating)
+		if ($floating)
 			$this->addToProperty("class", "floating");
 		$this->removePropertyValue("class", "selection");
 		return $this->addToProperty("class", "button");
 	}
 
-	public function asSelect($name=NULL,$multiple=false,$selection=true){
+	public function asSelect($name=NULL, $multiple=false, $selection=true) {
 		$this->_multiple=$multiple;
-		if(isset($name))
+		if (isset($name))
 			$this->addInput($name);
-		if($multiple){
+		if ($multiple) {
 			$this->addToProperty("class", "multiple");
 		}
-		if ($selection){
-			if($this->propertyContains("class", "button")===false)
-				$this->addToPropertyCtrl("class", "selection",array("selection"));
+		if ($selection) {
+			if ($this->propertyContains("class", "button")===false)
+				$this->addToPropertyCtrl("class", "selection", array("selection"));
 		}
 		return $this;
 	}
 
-	public function asSearch($name=NULL,$multiple=false,$selection=true){
-		$this->asSelect($name,$multiple,$selection);
+	public function asSearch($name=NULL, $multiple=false, $selection=true) {
+		$this->asSelect($name, $multiple, $selection);
 		return $this->addToProperty("class", "search");
 	}
 
-	public function setSelect($name=NULL,$multiple=false){
-		if(!isset($name))
+	public function setSelect($name=NULL, $multiple=false) {
+		if (!isset($name))
 			$name="select-".$this->identifier;
 		$this->input=null;
-		if($multiple){
+		if ($multiple) {
 			$this->setProperty("multiple", true);
 			$this->addToProperty("class", "multiple");
 		}
@@ -291,37 +291,37 @@ 
 		$this->tagName="select";
 		$this->setProperty("name", $name);
 		$this->content=null;
-		foreach ($this->items as $item){
+		foreach ($this->items as $item) {
 			$item->asOption();
 		}
 		return $this;
 	}
 
-	public function asSubmenu($pointing=NULL){
+	public function asSubmenu($pointing=NULL) {
 		$this->setClass("ui dropdown link item");
-		if(isset($pointing)){
+		if (isset($pointing)) {
 			$this->setPointing($pointing);
 		}
 		return $this;
 	}
 
-	public function setPointing($value=Direction::NONE){
-		return $this->addToPropertyCtrl("class", $value." pointing",Direction::getConstantValues("pointing"));
+	public function setPointing($value=Direction::NONE) {
+		return $this->addToPropertyCtrl("class", $value." pointing", Direction::getConstantValues("pointing"));
 	}
 
-	public function setValue($value){
+	public function setValue($value) {
 		$this->value=$value;
 		return $this;
 	}
-	private function applyValue(){
+	private function applyValue() {
 		$value=$this->value;
-		if(isset($this->input) && isset($value)){
+		if (isset($this->input) && isset($value)) {
 			$this->input->setProperty("value", $value);
-		}else{
+		} else {
 			$this->setProperty("value", $value);
 		}
 			$textElement=$this->getElementById("text-".$this->identifier, $this->content);
-			if(isset($textElement) && !$this->_multiple)
+			if (isset($textElement) && !$this->_multiple)
 				$textElement->setContent($value);
 		return $this;
 	}
@@ -331,9 +331,9 @@ 
 	 * @see BaseHtml::run()
 	 */
 	public function run(JsUtils $js) {
-		if($this->propertyContains("class", "simple")===false){
-			if(isset($this->_bsComponent)===false){
-				$this->_bsComponent=$js->semantic()->dropdown("#".$this->identifier,$this->_params);
+		if ($this->propertyContains("class", "simple")===false) {
+			if (isset($this->_bsComponent)===false) {
+				$this->_bsComponent=$js->semantic()->dropdown("#".$this->identifier, $this->_params);
 				$this->_bsComponent->setItemSelector(".item");
 			}
 			$this->addEventsOnRun($js);
@@ -341,44 +341,44 @@ 
 		}
 	}
 
-	public function setCompact(){
+	public function setCompact() {
 		return $this->addToPropertyCtrl("class", "compact", array("compact"));
 	}
 
-	public function setAction($action){
+	public function setAction($action) {
 		$this->_params["action"]=$action;
 	}
 
-	public function setOn($on){
+	public function setOn($on) {
 		$this->_params["on"]=$on;
 	}
 
-	public function setShowOnFocus($value){
+	public function setShowOnFocus($value) {
 		$this->_params["showOnFocus"]=$value;
 	}
 
-	public function setFullTextSearch($value){
+	public function setFullTextSearch($value) {
 		$this->_params["fullTextSearch"]=$value;
 	}
 
 	public function compile(JsUtils $js=NULL, &$view=NULL) {
 		$this->applyValue();
-		return parent::compile($js,$view);
+		return parent::compile($js, $view);
 	}
 
 	public function getInput() {
 		return $this->input;
 	}
 	public function addAction($action, $direction=Direction::RIGHT, $icon=NULL, $labeled=false) {
-		return $this->_addAction($this, $action,$direction,$icon,$labeled);
+		return $this->_addAction($this, $action, $direction, $icon, $labeled);
 	}
 
-	public function setIcon($icon="dropdown"){
+	public function setIcon($icon="dropdown") {
 		$this->content["arrow"]=new HtmlIcon($this->identifier."-icon", $icon);
 		return $this;
 	}
 
-	public function jsAddItem($caption){
+	public function jsAddItem($caption) {
 		$js="var first=$('#{$this->identifier} .item').first();if(first!=undefined){var new =first.clone();first.parent().append(new);first.html('{$caption}};')";
 		return $js;
 	}

Ajax/semantic/components/validation/FieldValidation.php

Spacing +10 added lines, -10 removed lines

@@ -7,7 +7,7 @@ 
  * @version 1.001
  * Generates a JSON field validator
  */
-class FieldValidation implements \JsonSerializable{
+class FieldValidation implements \JsonSerializable {
 	/**
 	 * @var string
 	 */
@@ -24,7 +24,7 @@ 
 
 	protected $optional;
 
-	public function __construct($identifier){
+	public function __construct($identifier) {
 		$this->identifier=$identifier;
 		$this->rules=[];
 	}
@@ -48,22 +48,22 @@ 
 	 * @param string $value
 	 * @return Rule
 	 */
-	public function addRule($type,$prompt=NULL,$value=NULL){
-		if($type instanceof  Rule)
+	public function addRule($type, $prompt=NULL, $value=NULL) {
+		if ($type instanceof  Rule)
 			$rule=$type;
-		else if(\is_array($type)){
+		else if (\is_array($type)) {
 			$value=JArray::getValue($type, "value", 2);
 			$prompt=JArray::getValue($type, "prompt", 1);
 			$type=JArray::getValue($type, "type", 0);
-			$rule=new Rule($type,$prompt,$value);
-		}else
-			$rule=new Rule($type,$prompt,$value);
+			$rule=new Rule($type, $prompt, $value);
+		} else
+			$rule=new Rule($type, $prompt, $value);
 		$this->rules[]=$rule;
 		return $rule;
 	}
 
-	public function jsonSerialize(){
-		return ["identifier"=>$this->identifier,"rules"=>$this->rules];
+	public function jsonSerialize() {
+		return ["identifier"=>$this->identifier, "rules"=>$this->rules];
 	}
 
 	public function setDepends($depends) {

Ajax/semantic/components/Dropdown.php

Spacing +5 added lines, -5 removed lines

@@ -17,8 +17,8 @@ 
 	 * @param string $action one of "select","auto","activate","combo","nothing","hide"
 	 * @return \Ajax\semantic\components\Dropdown
 	 */
-	public function setAction($action){
-		return $this->setParamCtrl("action", $action,array("select","auto","activate","combo","nothing","hide"));
+	public function setAction($action) {
+		return $this->setParamCtrl("action", $action, array("select", "auto", "activate", "combo", "nothing", "hide"));
 	}
 
 	/**
@@ -26,15 +26,15 @@ 
 	 * @param string $event Event used to trigger dropdown (Hover, Click, Custom Event)
 	 * @return \Ajax\semantic\components\Dropdown
 	 */
-	public function setOn($event){
+	public function setOn($event) {
 		return $this->setParam("on", $event);
 	}
 
-	public function setFullTextSearch($value){
+	public function setFullTextSearch($value) {
 		return $this->setParam("fullTextSearch", $value);
 	}
 
-	public function setShowOnFocus($value){
+	public function setShowOnFocus($value) {
 		return $this->setParam("showOnFocus", $value);
 	}
 }

Ajax/common/html/HtmlCollection.php

Spacing +40 added lines, -40 removed lines

@@ -15,44 +15,44 @@ 
  */
 abstract class HtmlCollection extends HtmlDoubleElement {
 
-	public function __construct($identifier,$tagName="div"){
-		parent::__construct($identifier,$tagName);
+	public function __construct($identifier, $tagName="div") {
+		parent::__construct($identifier, $tagName);
 		$this->content=array();
 	}
 
-	public function addItems($items){
-		if(JArray::isAssociative($items)){
-			foreach ($items as $k=>$v){
-				$this->addItem([$k,$v]);
+	public function addItems($items) {
+		if (JArray::isAssociative($items)) {
+			foreach ($items as $k=>$v) {
+				$this->addItem([$k, $v]);
 			}
-		}else{
-			foreach ($items as $item){
+		} else {
+			foreach ($items as $item) {
 				$this->addItem($item);
 			}
 		}
 		return $this;
 	}
 
-	public function setItems($items){
+	public function setItems($items) {
 		$this->content=$items;
 		return $this;
 	}
 
-	public function getItems(){
+	public function getItems() {
 		return $this->content;
 	}
 
-	protected function getItemToAdd($item){
+	protected function getItemToAdd($item) {
 		$itemO=$item;
-		if($this->createCondition($item)===true){
+		if ($this->createCondition($item)===true) {
 			$itemO=$this->createItem($item);
 		}
 		return $itemO;
 	}
 
-	protected function setItemIdentifier($item,$classname,$index){
-		if($item instanceof BaseWidget){
-			if(JString::isNull($item->getIdentifier())){
+	protected function setItemIdentifier($item, $classname, $index) {
+		if ($item instanceof BaseWidget) {
+			if (JString::isNull($item->getIdentifier())) {
 				$item->setIdentifier($classname."-".$this->identifier."-".$index);
 			}
 		}
@@ -63,15 +63,15 @@ 
 	 * @param HtmlDoubleElement|string|array $item
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
-	public function addItem($item){
+	public function addItem($item) {
 		$itemO=$this->getItemToAdd($item);
 		$this->addContent($itemO);
 		return $itemO;
 	}
 
-	public function insertItem($item,$position=0){
+	public function insertItem($item, $position=0) {
 		$itemO=$this->getItemToAdd($item);
-		\array_splice( $this->content, $position, 0, array($itemO));
+		\array_splice($this->content, $position, 0, array($itemO));
 		return $itemO;
 	}
 
@@ -94,11 +94,11 @@ 
 		return $this;
 	}
 
-	public function removeItem($index){
+	public function removeItem($index) {
 		return array_splice($this->content, $index, 1);
 	}
 
-	public function count(){
+	public function count() {
 		return \sizeof($this->content);
 	}
 
@@ -109,8 +109,8 @@ 
 		return $this->addItem($function($object));
 	}
 
-	public function apply($callBack){
-		foreach ($this->content as $item){
+	public function apply($callBack) {
+		foreach ($this->content as $item) {
 			$callBack($item);
 		}
 		return $this;
@@ -130,23 +130,23 @@ 
 	 */
 	abstract protected function createItem($value);
 
-	protected function createCondition($value){
+	protected function createCondition($value) {
 		return \is_object($value)===false;
 	}
 
-	protected function contentAs($tagName){
-		foreach ($this->content as $item){
+	protected function contentAs($tagName) {
+		foreach ($this->content as $item) {
 			$item->setTagName($tagName);
 		}
 		return $this;
 	}
 
-	public function setProperties($properties){
+	public function setProperties($properties) {
 		$i=0;
-		foreach ($properties as $k=>$v){
+		foreach ($properties as $k=>$v) {
 			$c=$this->content[$i++];
-			if(isset($c))
-				$c->setProperty($k,$v);
+			if (isset($c))
+				$c->setProperty($k, $v);
 			else
 				return $this;
 		}
@@ -159,17 +159,17 @@ 
 	 * @param array $values
 	 * @return HtmlCollection
 	 */
-	public function setPropertyValues($property,$values){
+	public function setPropertyValues($property, $values) {
 		$i=0;
-		if(\is_array($values)===false){
-			$values=\array_fill(0, $this->count(),$values);
+		if (\is_array($values)===false) {
+			$values=\array_fill(0, $this->count(), $values);
 		}
-		foreach ($values as $value){
+		foreach ($values as $value) {
 			$c=$this->content[$i++];
-			if(isset($c)){
-				$c->setProperty($property,$value);
+			if (isset($c)) {
+				$c->setProperty($property, $value);
 			}
-			else{
+			else {
 				return $this;
 			}
 		}
@@ -179,13 +179,13 @@ 
 	public function compile(JsUtils $js=NULL, &$view=NULL) {
 		$index=0;
 		$classname=\strtolower(JReflection::shortClassName($this));
-		foreach ($this->content as $item){
-			$this->setItemIdentifier($item,$classname,$index++);
+		foreach ($this->content as $item) {
+			$this->setItemIdentifier($item, $classname, $index++);
 		}
-		return parent::compile($js,$view);
+		return parent::compile($js, $view);
 	}
 
-	public function getItemById($identifier){
+	public function getItemById($identifier) {
 		return $this->getElementById($identifier, $this->content);
 	}
 }

Ajax/common/traits/JsUtilsEventsTrait.php

Spacing +8 added lines, -8 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
@@ -37,8 +37,8 @@ 
 	 * @param boolean $stopPropagation
 	 * @return string
 	 */
-	public function change($element='this', $js='',$preventDefault=false,$stopPropagation=false) {
-		return $this->_add_event($element, $js, 'change',$preventDefault,$stopPropagation);
+	public function change($element='this', $js='', $preventDefault=false, $stopPropagation=false) {
+		return $this->_add_event($element, $js, 'change', $preventDefault, $stopPropagation);
 	}
 
 	/**
@@ -51,9 +51,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
 			);
 		}
@@ -62,7 +62,7 @@ 
 			$js[]="return false;";
 		}
 
-		return $this->_add_event($element, $js, 'click',$preventDefault,$stopPropagation);
+		return $this->_add_event($element, $js, 'click', $preventDefault, $stopPropagation);
 	}
 
 	/**

Ajax/semantic/components/validation/Rule.php

Spacing +49 added lines, -49 removed lines

@@ -8,7 +8,7 @@ 
  * @version 1.001
  * Generates a JSON Rule for the validation of a field
  */
-class Rule implements \JsonSerializable{
+class Rule implements \JsonSerializable {
 	/**
 	 * @var string
 	 */
@@ -23,7 +23,7 @@ 
 	 */
 	private $value;
 
-	public function __construct($type,$prompt=NULL,$value=NULL){
+	public function __construct($type, $prompt=NULL, $value=NULL) {
 		$this->type=$type;
 		$this->prompt=$prompt;
 		$this->value=$value;
@@ -57,10 +57,10 @@ 
 	}
 
 	public function jsonSerialize() {
-		$result= ["type"=>$this->type];
-		if(isset($this->prompt))
+		$result=["type"=>$this->type];
+		if (isset($this->prompt))
 			$result["prompt"]=$this->prompt;
-		if(isset($this->value))
+		if (isset($this->value))
 			$result["value"]=$this->value;
 		return $result;
 	}
@@ -71,8 +71,8 @@ 
 	 * @param string $prompt
 	 * @return \Ajax\semantic\components\validation\Rule
 	 */
-	public static function match($name,$prompt=NULL){
-		return new Rule("match[".$name."]",$prompt);
+	public static function match($name, $prompt=NULL) {
+		return new Rule("match[".$name."]", $prompt);
 	}
 
 	/**
@@ -81,8 +81,8 @@ 
 	 * @param string $prompt
 	 * @return \Ajax\semantic\components\validation\Rule
 	 */
-	public static function different($name,$prompt=NULL){
-		return new Rule("different[".$name."]",$prompt);
+	public static function different($name, $prompt=NULL) {
+		return new Rule("different[".$name."]", $prompt);
 	}
 
 	/**
@@ -92,82 +92,82 @@ 
 	 * @param string $prompt
 	 * @return \Ajax\semantic\components\validation\Rule
 	 */
-	public static function integer($min=NULL,$max=NULL,$prompt=NULL){
-		if(\is_int($min) && \is_int($max))
-			return new Rule("integer[{$min}..{$max}]",$prompt);
-		return new Rule("integer",$prompt);
+	public static function integer($min=NULL, $max=NULL, $prompt=NULL) {
+		if (\is_int($min) && \is_int($max))
+			return new Rule("integer[{$min}..{$max}]", $prompt);
+		return new Rule("integer", $prompt);
 	}
 
-	public static function decimal($prompt=NULL){
-		return new Rule("decimal",$prompt);
+	public static function decimal($prompt=NULL) {
+		return new Rule("decimal", $prompt);
 	}
 
-	public static function number($prompt=NULL){
-		return new Rule("number",$prompt);
+	public static function number($prompt=NULL) {
+		return new Rule("number", $prompt);
 	}
 
-	public static function is($value,$prompt=NULL){
-		return new Rule("is[".$value."]",$prompt);
+	public static function is($value, $prompt=NULL) {
+		return new Rule("is[".$value."]", $prompt);
 	}
 
-	public static function isExactly($value,$prompt=NULL){
-		return new Rule("isExactly[".$value."]",$prompt);
+	public static function isExactly($value, $prompt=NULL) {
+		return new Rule("isExactly[".$value."]", $prompt);
 	}
 
-	public static function not($value,$prompt=NULL){
-		return new Rule("not[".$value."]",$prompt);
+	public static function not($value, $prompt=NULL) {
+		return new Rule("not[".$value."]", $prompt);
 	}
 
-	public static function notExactly($value,$prompt=NULL){
-		return new Rule("notExactly[".$value."]",$prompt);
+	public static function notExactly($value, $prompt=NULL) {
+		return new Rule("notExactly[".$value."]", $prompt);
 	}
 
-	public static function contains($value,$prompt=NULL){
-		return new Rule("contains[".$value."]",$prompt);
+	public static function contains($value, $prompt=NULL) {
+		return new Rule("contains[".$value."]", $prompt);
 	}
 
-	public static function containsExactly($value,$prompt=NULL){
-		return new Rule("containsExactly[".$value."]",$prompt);
+	public static function containsExactly($value, $prompt=NULL) {
+		return new Rule("containsExactly[".$value."]", $prompt);
 	}
 
-	public static function doesntContain($value,$prompt=NULL){
-		return new Rule("doesntContain[".$value."]",$prompt);
+	public static function doesntContain($value, $prompt=NULL) {
+		return new Rule("doesntContain[".$value."]", $prompt);
 	}
 
-	public static function doesntContainExactly($value,$prompt=NULL){
-		return new Rule("doesntContainExactly[".$value."]",$prompt);
+	public static function doesntContainExactly($value, $prompt=NULL) {
+		return new Rule("doesntContainExactly[".$value."]", $prompt);
 	}
 
-	public static function minCount($value,$prompt=NULL){
-		return new Rule("minCount[".$value."]",$prompt);
+	public static function minCount($value, $prompt=NULL) {
+		return new Rule("minCount[".$value."]", $prompt);
 	}
 
-	public static function maxCount($value,$prompt=NULL){
-		return new Rule("maxCount[".$value."]",$prompt);
+	public static function maxCount($value, $prompt=NULL) {
+		return new Rule("maxCount[".$value."]", $prompt);
 	}
 
-	public static function exactCount($value,$prompt=NULL){
-		return new Rule("exactCount[".$value."]",$prompt);
+	public static function exactCount($value, $prompt=NULL) {
+		return new Rule("exactCount[".$value."]", $prompt);
 	}
 
-	public static function email($prompt=NULL){
-		return new Rule("email",$prompt);
+	public static function email($prompt=NULL) {
+		return new Rule("email", $prompt);
 	}
 
-	public static function url($prompt=NULL){
-		return new Rule("url",$prompt);
+	public static function url($prompt=NULL) {
+		return new Rule("url", $prompt);
 	}
 
-	public static function regExp($value,$prompt=NULL){
-		return new Rule("regExp",$prompt,$value);
+	public static function regExp($value, $prompt=NULL) {
+		return new Rule("regExp", $prompt, $value);
 	}
 
-	public static function custom($name,$jsFunction){
-		return "$.fn.form.settings.rules.".$name." =".$jsFunction ;
+	public static function custom($name, $jsFunction) {
+		return "$.fn.form.settings.rules.".$name." =".$jsFunction;
 	}
 
-	public static function ajax(JsUtils $js,$name,$url,$params,$jsCallback,$method="post",$parameters=[]){
-		$parameters=\array_merge(["async"=>false,"url"=>$url,"params"=>$params,"hasLoader"=>false,"jsCallback"=>$jsCallback,"dataType"=>"json","stopPropagation"=>false,"preventDefault"=>false,"responseElement"=>null],$parameters);
+	public static function ajax(JsUtils $js, $name, $url, $params, $jsCallback, $method="post", $parameters=[]) {
+		$parameters=\array_merge(["async"=>false, "url"=>$url, "params"=>$params, "hasLoader"=>false, "jsCallback"=>$jsCallback, "dataType"=>"json", "stopPropagation"=>false, "preventDefault"=>false, "responseElement"=>null], $parameters);
 		$ajax=new AjaxCall($method, $parameters);
 		return self::custom($name, "function(value){var result=true;".$ajax->compile($js)."return result;}");
 	}

Ajax/common/traits/JsUtilsAjaxTrait.php

Spacing +93 added lines, -93 removed lines

@@ -16,9 +16,9 @@ 
 	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,$responseElement="",$parameters=[]) {
+	protected function _ajax($method, $url, $responseElement="", $parameters=[]) {
 		$jsCallback=null;
 		$attr="id";
 		$hasLoader=true;
@@ -35,80 +35,80 @@ 
 		$retour=$this->_getAjaxUrl($url, $attr);
 		$responseElement=$this->_getResponseElement($responseElement);
 		$retour.="var self=this;\n";
-		if($hasLoader===true && JString::isNotNull($responseElement)){
+		if ($hasLoader===true && JString::isNotNull($responseElement)) {
 			$this->addLoading($retour, $responseElement);
 		}
-		$ajaxParameters=["url"=>"url","method"=>"'".\strtoupper($method)."'"];
-		if(!$async){
+		$ajaxParameters=["url"=>"url", "method"=>"'".\strtoupper($method)."'"];
+		if (!$async) {
 			$ajaxParameters["async"]="false";
 		}
-		if(isset($params)){
+		if (isset($params)) {
 			$ajaxParameters["data"]=self::_correctParams($params);
 		}
-		if(isset($headers)){
+		if (isset($headers)) {
 			$ajaxParameters["headers"]=$headers;
 		}
 		$this->createAjaxParameters($ajaxParameters, $parameters);
 		$retour.="$.ajax({".$this->implodeAjaxParameters($ajaxParameters)."}).done(function( data, textStatus, jqXHR ) {\n";
-		$retour.=$this->_getOnAjaxDone($responseElement, $jqueryDone,$ajaxTransition,$jsCallback)."});\n";
-		$retour=$this->_addJsCondition($jsCondition,$retour);
+		$retour.=$this->_getOnAjaxDone($responseElement, $jqueryDone, $ajaxTransition, $jsCallback)."});\n";
+		$retour=$this->_addJsCondition($jsCondition, $retour);
 		if ($immediatly)
 			$this->jquery_code_for_compile[]=$retour;
 		return $retour;
 	}
 
-	protected function createAjaxParameters(&$original,$parameters){
-		$validParameters=["dataType"=>"'%value%'","beforeSend"=>"function(jqXHR,settings){%value%}","complete"=>"function(jqXHR){%value%}"];
-		foreach ($validParameters as $param=>$mask){
-			if(isset($parameters[$param])){
+	protected function createAjaxParameters(&$original, $parameters) {
+		$validParameters=["dataType"=>"'%value%'", "beforeSend"=>"function(jqXHR,settings){%value%}", "complete"=>"function(jqXHR){%value%}"];
+		foreach ($validParameters as $param=>$mask) {
+			if (isset($parameters[$param])) {
 				$original[$param]=\str_replace("%value%", $parameters[$param], $mask);
 			}
 		}
 	}
 
-	protected function implodeAjaxParameters($ajaxParameters){
-		$s = ''; foreach ($ajaxParameters as $k=>$v) { if ($s !== '') { $s .= ','; } $s .= "'{$k}':{$v}"; }
+	protected function implodeAjaxParameters($ajaxParameters) {
+		$s=''; foreach ($ajaxParameters as $k=>$v) { if ($s!=='') { $s.=','; } $s.="'{$k}':{$v}"; }
 		return $s;
 	}
 
-	protected function _addJsCondition($jsCondition,$jsSource){
-		if(isset($jsCondition)){
+	protected function _addJsCondition($jsCondition, $jsSource) {
+		if (isset($jsCondition)) {
 			return "if(".$jsCondition."){\n".$jsSource."\n}";
 		}
 		return $jsSource;
 	}
 
 
-	protected function _getAjaxUrl($url,$attr){
+	protected function _getAjaxUrl($url, $attr) {
 		$url=$this->_correctAjaxUrl($url);
 		$retour="url='".$url."';";
 		$slash="/";
-		if(JString::endswith($url, "/")===true){
+		if (JString::endswith($url, "/")===true) {
 			$slash="";
 		}
-		if(JString::isNotNull($attr)){
-			if ($attr==="value"){
+		if (JString::isNotNull($attr)) {
+			if ($attr==="value") {
 				$retour.="url=url+'".$slash."'+$(this).val();\n";
-			}elseif ($attr==="html"){
+			}elseif ($attr==="html") {
 				$retour.="url=url+'".$slash."'+$(this).html();\n";
-			}elseif(\substr($attr, 0,3)==="js:"){
+			}elseif (\substr($attr, 0, 3)==="js:") {
 				$retour.="url=url+'".$slash."'+".\substr($attr, 3).";\n";
-			}elseif($attr!==null && $attr!=="")
+			}elseif ($attr!==null && $attr!=="")
 				$retour.="url=url+'".$slash."'+($(this).attr('".$attr."')||'');\n";
 		}
 		return $retour;
 	}
 
-	protected function _getOnAjaxDone($responseElement,$jqueryDone,$ajaxTransition,$jsCallback){
-		$retour="";$call=null;
+	protected function _getOnAjaxDone($responseElement, $jqueryDone, $ajaxTransition, $jsCallback) {
+		$retour=""; $call=null;
 		if (JString::isNotNull($responseElement)) {
-			if(isset($ajaxTransition)){
+			if (isset($ajaxTransition)) {
 				$call=$this->setAjaxDataCall($ajaxTransition);
-			}elseif(isset($this->ajaxTransition)){
+			}elseif (isset($this->ajaxTransition)) {
 				$call=$this->ajaxTransition;
 			}
-			if(\is_callable($call))
-				$retour="\t".$call($responseElement,$jqueryDone).";\n";
+			if (\is_callable($call))
+				$retour="\t".$call($responseElement, $jqueryDone).";\n";
 			else
 				$retour="\t{$responseElement}.{$jqueryDone}( data );\n";
 		}
@@ -116,7 +116,7 @@ 
 		return $retour;
 	}
 
-	protected function _getResponseElement($responseElement){
+	protected function _getResponseElement($responseElement) {
 		if (JString::isNotNull($responseElement)) {
 			$responseElement=Javascript::prep_value($responseElement);
 			$responseElement=Javascript::prep_jquery_selector($responseElement);
@@ -127,26 +127,26 @@ 
 	protected function _correctAjaxUrl($url) {
 		if ($url!=="/" && JString::endsWith($url, "/")===true)
 			$url=substr($url, 0, strlen($url)-1);
-			if (strncmp($url, 'http://', 7)!=0&&strncmp($url, 'https://', 8)!=0) {
+			if (strncmp($url, 'http://', 7)!=0 && strncmp($url, 'https://', 8)!=0) {
 				$url=$this->getUrl($url);
 			}
 			return $url;
 	}
 
-	public static function _correctParams($params){
-		if(JString::isNull($params)){
+	public static function _correctParams($params) {
+		if (JString::isNull($params)) {
 			return "";
 		}
-		if(\preg_match("@^\{.*?\}$@", $params)){
+		if (\preg_match("@^\{.*?\}$@", $params)) {
 			return '$.param('.$params.')';
 		}
 		return $params;
 	}
 
-	public static function _implodeParams($parameters){
+	public static function _implodeParams($parameters) {
 		$allParameters=[];
-		foreach ($parameters as $params){
-			if(isset($params))
+		foreach ($parameters as $params) {
+			if (isset($params))
 				$allParameters[]=self::_correctParams($params);
 		}
 		return \implode("+'&'+", $allParameters);
@@ -164,19 +164,19 @@ 
 		$retour.="\t\t{$responseElement}.prepend('{$loading_notifier}');\n";
 	}
 
-	protected function setAjaxDataCall($params){
+	protected function setAjaxDataCall($params) {
 		$result=null;
-		if(!\is_callable($params)){
-			$result=function ($responseElement,$jqueryDone="html") use($params){
-				return AjaxTransition::{$params}($responseElement,$jqueryDone);
+		if (!\is_callable($params)) {
+			$result=function($responseElement, $jqueryDone="html") use($params){
+				return AjaxTransition::{$params}($responseElement, $jqueryDone);
 			};
 		}
 		return $result;
 	}
 
-	protected function setDefaultParameters(&$parameters,$default){
-		foreach ($default as $k=>$v){
-			if(!isset($parameters[$k]))
+	protected function setDefaultParameters(&$parameters, $default) {
+		foreach ($default as $k=>$v) {
+			if (!isset($parameters[$k]))
 				$parameters[$k]=$v;
 		}
 	}
@@ -190,8 +190,8 @@ 
 	 * @param string $url The url of the request
 	 * @param string $responseElement selector of the HTML element displaying the answer
 	 */
-	private function _get($url, $responseElement="",$parameters=[]) {
-		return $this->_ajax("get", $url,$responseElement,$parameters);
+	private function _get($url, $responseElement="", $parameters=[]) {
+		return $this->_ajax("get", $url, $responseElement, $parameters);
 	}
 
 	/**
@@ -200,9 +200,9 @@ 
 	 * @param string $responseElement selector of the HTML element displaying the answer
 	 * @param array $parameters default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null)
 	 */
-	public function get($url, $responseElement="",$parameters=[]) {
+	public function get($url, $responseElement="", $parameters=[]) {
 		$parameters["immediatly"]=true;
-		return $this->_get($url,$responseElement,$parameters);
+		return $this->_get($url, $responseElement, $parameters);
 	}
 
 	/**
@@ -212,9 +212,9 @@ 
 	 * @param string $responseElement selector of the HTML element displaying the answer
 	 * @param array $parameters default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null)
 	 */
-	public function ajax($method,$url, $responseElement="", $parameters=[]) {
+	public function ajax($method, $url, $responseElement="", $parameters=[]) {
 		$parameters["immediatly"]=true;
-		return $this->_ajax($method,$url,$responseElement,$parameters);
+		return $this->_ajax($method, $url, $responseElement, $parameters);
 	}
 
 	/**
@@ -224,9 +224,9 @@ 
 	 * @param string $responseElement selector of the HTML element displaying the answer
 	 * @param array $parameters default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null)
 	 */
-	public function ajaxDeferred($method,$url, $responseElement="", $parameters=[]) {
+	public function ajaxDeferred($method, $url, $responseElement="", $parameters=[]) {
 		$parameters["immediatly"]=false;
-		return $this->_ajax($method,$url,$responseElement,$parameters);
+		return $this->_ajax($method, $url, $responseElement, $parameters);
 	}
 
 	/**
@@ -235,15 +235,15 @@ 
 	 * @param string $method Method used
 	 * @param array $parameters default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","context"=>"document","jsCondition"=>NULL,"headers"=>null,"immediatly"=>false)
 	 */
-	private function _json($url, $method="get",$parameters=[]) {
-		$parameters=\array_merge($parameters,["hasLoader"=>false]);
+	private function _json($url, $method="get", $parameters=[]) {
+		$parameters=\array_merge($parameters, ["hasLoader"=>false]);
 		$jsCallback=isset($parameters['jsCallback']) ? $parameters['jsCallback'] : "";
 		$context=isset($parameters['context']) ? $parameters['context'] : "document";
 		$retour="\tdata=($.isPlainObject(data))?data:JSON.parse(data);\t".$jsCallback.";\n\tfor(var key in data){"
 				."if($('#'+key,".$context.").length){ if($('#'+key,".$context.").is('[value]')) { $('#'+key,".$context.").val(data[key]);} else { $('#'+key,".$context.").html(data[key]); }}};\n";
 				$retour.="\t$(document).trigger('jsonReady',[data]);\n";
 		$parameters["jsCallback"]=$retour;
-		return $this->_ajax($method, $url,null,$parameters);
+		return $this->_ajax($method, $url, null, $parameters);
 	}
 
 	/**
@@ -253,7 +253,7 @@ 
 	 * @param array $parameters default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","context"=>"document","jsCondition"=>NULL,"headers"=>null,"immediatly"=>false)
 	 */
 	public function json($url, $method="get", $parameters=[]) {
-		return $this->_json($url,$method,$parameters);
+		return $this->_json($url, $method, $parameters);
 	}
 
 	/**
@@ -264,9 +264,9 @@ 
 	 * @param string $method default get
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","params"=>"{}","method"=>"get","immediatly"=>true)
 	 */
-	public function jsonOn($event,$element, $url,$method="get",$parameters=array()) {
-		$this->setDefaultParameters($parameters, ["preventDefault"=>true,"stopPropagation"=>true,"immediatly"=>true]);
-		return $this->_add_event($element, $this->jsonDeferred($url,$method, $parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"],$parameters["immediatly"]);
+	public function jsonOn($event, $element, $url, $method="get", $parameters=array()) {
+		$this->setDefaultParameters($parameters, ["preventDefault"=>true, "stopPropagation"=>true, "immediatly"=>true]);
+		return $this->_add_event($element, $this->jsonDeferred($url, $method, $parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"], $parameters["immediatly"]);
 	}
 
 	/**
@@ -277,7 +277,7 @@ 
 	 */
 	public function jsonDeferred($url, $method="get", $parameters=[]) {
 		$parameters["immediatly"]=false;
-		return $this->_json($url,$method,$parameters);
+		return $this->_json($url, $method, $parameters);
 	}
 
 	/**
@@ -288,26 +288,26 @@ 
 	 * @param array $parameters default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","context"=>null,"jsCondition"=>NULL,"headers"=>null,"immediatly"=>false,"rowClass"=>"_json")
 	 */
 	private function _jsonArray($maskSelector, $url, $method="get", $parameters=[]) {
-		$parameters=\array_merge($parameters,["hasLoader"=>false]);
+		$parameters=\array_merge($parameters, ["hasLoader"=>false]);
 		$rowClass=isset($parameters['rowClass']) ? $parameters['rowClass'] : "_json";
 		$jsCallback=isset($parameters['jsCallback']) ? $parameters['jsCallback'] : "";
 		$context=isset($parameters['context']) ? $parameters['context'] : null;
-		if($context===null){
+		if ($context===null) {
 			$parent="$('".$maskSelector."').parent()";
-			$newElm = "$('#'+newId)";
-		}else{
+			$newElm="$('#'+newId)";
+		} else {
 			$parent=$context;
-			$newElm = $context.".find('#'+newId)";
+			$newElm=$context.".find('#'+newId)";
 		}
 		$appendTo="\t\tnewElm.appendTo(".$parent.");\n";
 		$retour=$parent.".find('.{$rowClass}').remove();";
 		$retour.="\tdata=($.isPlainObject(data))?data:JSON.parse(data);\t".$jsCallback.";\n$.each(data, function(index, value) {\n"."\tvar created=false;var maskElm=$('".$maskSelector."').first();maskElm.hide();"."\tvar newId=(maskElm.attr('id') || 'mask')+'-'+index;"."\tvar newElm=".$newElm.";\n"."\tif(!newElm.length){\n"."\t\tnewElm=maskElm.clone();
 		newElm.attr('id',newId);\n;newElm.addClass('{$rowClass}').removeClass('_jsonArrayModel');\nnewElm.find('[id]').each(function(){ var newId=$(this).attr('id')+'-'+index;$(this).attr('id',newId).removeClass('_jsonArrayChecked');});\n";
-		$retour.= $appendTo;
+		$retour.=$appendTo;
 		$retour.="\t}\n"."\tfor(var key in value){\n"."\t\t\tvar html = $('<div />').append($(newElm).clone()).html();\n"."\t\t\tif(html.indexOf('__'+key+'__')>-1){\n"."\t\t\t\tcontent=$(html.split('__'+key+'__').join(value[key]));\n"."\t\t\t\t$(newElm).replaceWith(content);newElm=content;\n"."\t\t\t}\n"."\t\tvar sel='[data-id=\"'+key+'\"]';if($(sel,newElm).length){\n"."\t\t\tvar selElm=$(sel,newElm);\n"."\t\t\t if(selElm.is('[value]')) { selElm.attr('value',value[key]);selElm.val(value[key]);} else { selElm.html(value[key]); }\n"."\t\t}\n"."}\n"."\t$(newElm).show(true);"."\n"."\t$(newElm).removeClass('hide');"."});\n";
 		$retour.="\t$(document).trigger('jsonReady',[data]);\n";
 		$parameters["jsCallback"]=$retour;
-		return $this->_ajax($method, $url,null,$parameters);
+		return $this->_ajax($method, $url, null, $parameters);
 	}
 
 	/**
@@ -318,7 +318,7 @@ 
 	 * @param array $parameters default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","context"=>null,"jsCondition"=>NULL,"headers"=>null,"immediatly"=>false,"rowClass"=>"_json")
 	 */
 	public function jsonArray($maskSelector, $url, $method="get", $parameters=[]) {
-		return $this->_jsonArray($maskSelector, $url,$method,$parameters);
+		return $this->_jsonArray($maskSelector, $url, $method, $parameters);
 	}
 
 	/**
@@ -341,9 +341,9 @@ 
 	 * @param string $method Method used, default : get
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","params"=>"{}","method"=>"get","rowClass"=>"_json","immediatly"=>true)
 	 */
-	public function jsonArrayOn($event,$element,$maskSelector, $url,$method="get",$parameters=array()) {
-		$this->setDefaultParameters($parameters, ["preventDefault"=>true,"stopPropagation"=>true,"immediatly"=>true]);
-		return $this->_add_event($element, $this->jsonArrayDeferred($maskSelector,$url,$method, $parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"],$parameters["immediatly"]);
+	public function jsonArrayOn($event, $element, $maskSelector, $url, $method="get", $parameters=array()) {
+		$this->setDefaultParameters($parameters, ["preventDefault"=>true, "stopPropagation"=>true, "immediatly"=>true]);
+		return $this->_add_event($element, $this->jsonArrayDeferred($maskSelector, $url, $method, $parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"], $parameters["immediatly"]);
 	}
 
 	/**
@@ -355,7 +355,7 @@ 
 	 */
 	public function getDeferred($url, $responseElement="", $parameters=[]) {
 		$parameters["immediatly"]=false;
-		return $this->_get($url, $responseElement,$parameters);
+		return $this->_get($url, $responseElement, $parameters);
 	}
 
 	/**
@@ -368,8 +368,8 @@ 
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"immediatly"=>true,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>null,"headers"=>null)
 	 */
 	public function getOn($event, $element, $url, $responseElement="", $parameters=array()) {
-		$this->setDefaultParameters($parameters, ["preventDefault"=>true,"stopPropagation"=>true,"immediatly"=>true]);
-		return $this->_add_event($element, $this->getDeferred($url,$responseElement,$parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"],$parameters["immediatly"]);
+		$this->setDefaultParameters($parameters, ["preventDefault"=>true, "stopPropagation"=>true, "immediatly"=>true]);
+		return $this->_add_event($element, $this->getDeferred($url, $responseElement, $parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"], $parameters["immediatly"]);
 	}
 
 	/**
@@ -382,8 +382,8 @@ 
 	 * @param array $parameters default : array("method"=>"get","preventDefault"=>true,"stopPropagation"=>true,"params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"immediatly"=>true,"jqueryDone"=>"html","jsCondition"=>NULL,"headers"=>null)
 	 */
 	public function ajaxOn($event, $element, $url, $responseElement="", $parameters=array()) {
-		$this->setDefaultParameters($parameters, ["preventDefault"=>true,"stopPropagation"=>true,"immediatly"=>true,"method"=>"get"]);
-		return $this->_add_event($element, $this->ajaxDeferred($parameters["method"],$url,$responseElement,$parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"],$parameters["immediatly"]);
+		$this->setDefaultParameters($parameters, ["preventDefault"=>true, "stopPropagation"=>true, "immediatly"=>true, "method"=>"get"]);
+		return $this->_add_event($element, $this->ajaxDeferred($parameters["method"], $url, $responseElement, $parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"], $parameters["immediatly"]);
 	}
 
 	/**
@@ -410,9 +410,9 @@ 
 		return $this->getOn("click", $element, $url, $responseElement, $parameters);
 	}
 
-	private function _post($url, $params="{}",$responseElement="", $parameters=[]) {
+	private function _post($url, $params="{}", $responseElement="", $parameters=[]) {
 		$parameters["params"]=$params;
-		return $this->_ajax("POST", $url,$responseElement,$parameters);
+		return $this->_ajax("POST", $url, $responseElement, $parameters);
 	}
 
 	/**
@@ -422,8 +422,8 @@ 
 	 * @param string $params JSON parameters
 	 * @param array $parameters default : array("jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"immediatly"=>true,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null)
 	 */
-	public function post($url, $params="{}",$responseElement="", $parameters=[]) {
-		return $this->_post($url, $params,$responseElement, $parameters);
+	public function post($url, $params="{}", $responseElement="", $parameters=[]) {
+		return $this->_post($url, $params, $responseElement, $parameters);
 	}
 
 	/**
@@ -434,7 +434,7 @@ 
 	 * @param string $responseElement selector of the HTML element displaying the answer
 	 * @param array $parameters default : array("jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"immediatly"=>true,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null)
 	 */
-	public function postDeferred($url, $params="{}",$responseElement="", $parameters=[]) {
+	public function postDeferred($url, $params="{}", $responseElement="", $parameters=[]) {
 		$parameters["immediatly"]=false;
 		return $this->_post($url, $params, $responseElement, $parameters);
 	}
@@ -450,8 +450,8 @@ 
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"immediatly"=>true,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null)
 	 */
 	public function postOn($event, $element, $url, $params="{}", $responseElement="", $parameters=array()) {
-		$this->setDefaultParameters($parameters, ["preventDefault"=>true,"stopPropagation"=>true,"immediatly"=>true]);
-		return $this->_add_event($element, $this->postDeferred($url, $params, $responseElement, $parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"],$parameters["immediatly"]);
+		$this->setDefaultParameters($parameters, ["preventDefault"=>true, "stopPropagation"=>true, "immediatly"=>true]);
+		return $this->_add_event($element, $this->postDeferred($url, $params, $responseElement, $parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"], $parameters["immediatly"]);
 	}
 
 	/**
@@ -468,27 +468,27 @@ 
 	}
 
 	private function _postForm($url, $form, $responseElement, $parameters=[]) {
-		$params="{}";$validation=false;$jsCallback=NULL;$attr="id";$hasLoader=true;$jqueryDone="html";$ajaxTransition=null;$immediatly=false;$jsCondition=NULL;$headers=NULL;$async=true;
+		$params="{}"; $validation=false; $jsCallback=NULL; $attr="id"; $hasLoader=true; $jqueryDone="html"; $ajaxTransition=null; $immediatly=false; $jsCondition=NULL; $headers=NULL; $async=true;
 		\extract($parameters);
-		$async=($async)?"true":"false";
+		$async=($async) ? "true" : "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);
 		}
-		$ajaxParameters=["url"=>"url","method"=>"'POST'","data"=>"params","async"=>$async];
-		if(isset($headers)){
+		$ajaxParameters=["url"=>"url", "method"=>"'POST'", "data"=>"params", "async"=>$async];
+		if (isset($headers)) {
 			$ajaxParameters["headers"]=$headers;
 		}
 		$this->createAjaxParameters($ajaxParameters, $parameters);
 		$retour.="$.ajax({".$this->implodeAjaxParameters($ajaxParameters)."}).done(function( data ) {\n";
-		$retour.=$this->_getOnAjaxDone($responseElement, $jqueryDone,$ajaxTransition,$jsCallback)."});\n";
+		$retour.=$this->_getOnAjaxDone($responseElement, $jqueryDone, $ajaxTransition, $jsCallback)."});\n";
 
 		if ($validation) {
 			$retour="$('#".$form."').validate({submitHandler: function(form) {
@@ -538,8 +538,8 @@ 
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"validation"=>false,"params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"immediatly"=>true,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>null,"headers"=>null)
 	 */
 	public function postFormOn($event, $element, $url, $form, $responseElement="", $parameters=array()) {
-		$this->setDefaultParameters($parameters, ["preventDefault"=>true,"stopPropagation"=>true,"immediatly"=>true]);
-		return $this->_add_event($element, $this->postFormDeferred($url, $form, $responseElement,$parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"],$parameters["immediatly"]);
+		$this->setDefaultParameters($parameters, ["preventDefault"=>true, "stopPropagation"=>true, "immediatly"=>true]);
+		return $this->_add_event($element, $this->postFormDeferred($url, $form, $responseElement, $parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"], $parameters["immediatly"]);
 	}
 
 	/**

Ajax/service/AjaxCall.php

Spacing +5 added lines, -5 removed lines

@@ -23,21 +23,21 @@ 
 		$this->parameters["immediatly"]=false;
 		extract($this->parameters);
 		$result=$this->_eventPreparing($preventDefault, $stopPropagation);
-		switch($this->method) {
+		switch ($this->method) {
 			case "get":
 				$result.=$js->getDeferred($url, $responseElement, $this->parameters);
 				break;
 			case "post":
-				$result.=$js->postDeferred($url, $params,$responseElement, $this->parameters);
+				$result.=$js->postDeferred($url, $params, $responseElement, $this->parameters);
 				break;
 			case "postForm":
 				$result.=$js->postFormDeferred($url, $form, $responseElement, $this->parameters);
 				break;
 			case "json":
-				$result.=$js->jsonDeferred($url,$method,$this->parameters);
+				$result.=$js->jsonDeferred($url, $method, $this->parameters);
 				break;
 			case "jsonArray":
-				$result.=$js->jsonArrayDeferred($modelSelector, $url,$method,$this->parameters);
+				$result.=$js->jsonArrayDeferred($modelSelector, $url, $method, $this->parameters);
 				break;
 			default:
 				//$result.=$js->ajax($this->method, $url,$responseElement,$this->parameters);
@@ -46,7 +46,7 @@ 
 		return $result;
 	}
 
-	protected function _eventPreparing($preventDefault,$stopPropagation){
+	protected function _eventPreparing($preventDefault, $stopPropagation) {
 		$result="";
 		if ($preventDefault===true) {
 			$result.=Javascript::$preventDefault;