phpMv / phpMv-UI

Ajax/semantic/html/elements/HtmlButtonGroups.php

Spacing +19 added lines, -19 removed lines

@@ -18,11 +18,11 @@ 
 	protected $_dropdown;
 	public function __construct($identifier, $elements=array(), $asIcons=false) {
 		parent::__construct($identifier, "div", "ui buttons");
-		if ($asIcons === true)
+		if ($asIcons===true)
 			$this->asIcons();
 		$this->addElements($elements, $asIcons);
 	}
-	protected function createItem($value){
+	protected function createItem($value) {
 		return new HtmlButton("", $value);
 	}
 
@@ -31,10 +31,10 @@ 
 	 * @param boolean $asCombo
 	 * @return HtmlDropdown|HtmlButton
 	 */
-	public function addDropdown($items,$asCombo=false){
-		$dd= new HtmlDropdown("dd-".$this->identifier,null,$items);
+	public function addDropdown($items, $asCombo=false) {
+		$dd=new HtmlDropdown("dd-".$this->identifier, null, $items);
 		$dd->asButton();
-		if($asCombo){
+		if ($asCombo) {
 			$dd->setAction("combo");
 			$dd->addToProperty("class", "combo");
 		}
@@ -50,13 +50,13 @@ 
 	 */
 	public function addElement($element, $asIcon=false) {
 		$item=$this->addItem($element);
-		if($asIcon && $item instanceof HtmlButton)
+		if ($asIcon && $item instanceof HtmlButton)
 			$item->asIcon($element);
 		return $item;
 	}
 
 	public function addElements($elements, $asIcons=false) {
-		foreach ( $elements as $element ) {
+		foreach ($elements as $element) {
 			$this->addElement($element, $asIcons);
 		}
 		return $this;
@@ -65,7 +65,7 @@ 
 	public function insertOr($aferIndex=0, $or="or") {
 		$orElement=new HtmlSemDoubleElement("", "div", "or");
 		$orElement->setProperty("data-text", $or);
-		array_splice($this->content, $aferIndex + 1, 0, array ($orElement ));
+		array_splice($this->content, $aferIndex+1, 0, array($orElement));
 		return $this;
 	}
 
@@ -78,8 +78,8 @@ 
 	}
 
 	public function asIcons() {
-		foreach ( $this->content as $item ) {
-			if($item instanceof HtmlButton)
+		foreach ($this->content as $item) {
+			if ($item instanceof HtmlButton)
 			$item->asIcon($item->getContent());
 		}
 		return $this->addToProperty("class", "icons");
@@ -90,9 +90,9 @@ 
 	 * @param array $icons
 	 * @return HtmlButtonGroups
 	 */
-	public function addIcons($icons){
-		foreach ( $this->content as $index=>$item ) {
-			if($item instanceof HtmlButton && isset($icons[$index]))
+	public function addIcons($icons) {
+		foreach ($this->content as $index=>$item) {
+			if ($item instanceof HtmlButton && isset($icons[$index]))
 				$item->addIcon($icons[$index]);
 		}
 		return $this;
@@ -132,7 +132,7 @@ 
 	 * @see \Ajax\bootstrap\html\base\BaseHtml::on()
 	 */
 	public function on($event, $jsCode, $stopPropagation=false, $preventDefault=false) {
-		foreach ( $this->content as $element ) {
+		foreach ($this->content as $element) {
 			$element->on($event, $jsCode, $stopPropagation, $preventDefault);
 		}
 		return $this;
@@ -144,10 +144,10 @@ 
 
 	public function addClasses($classes=array()) {
 		$i=0;
-		if(!\is_array($classes)){
-			$classes=array_fill (0,$this->count(),$classes);
+		if (!\is_array($classes)) {
+			$classes=array_fill(0, $this->count(), $classes);
 		}
-		foreach ( $this->content as $button ) {
+		foreach ($this->content as $button) {
 			$button->addToProperty("class", $classes[$i++]);
 		}
 		return $this;
@@ -161,8 +161,8 @@ 
 		$this->addElement($function($object));
 	}
 
-	public function run(JsUtils $js){
-		$result= parent::run($js);
+	public function run(JsUtils $js) {
+		$result=parent::run($js);
 		return $result->setItemSelector(".ui.button");
 	}
 

Braces +12 added lines, -8 removed lines

@@ -18,8 +18,9 @@ 
 	protected $_dropdown;
 	public function __construct($identifier, $elements=array(), $asIcons=false) {
 		parent::__construct($identifier, "div", "ui buttons");
-		if ($asIcons === true)
-			$this->asIcons();
+		if ($asIcons === true) {
+					$this->asIcons();
+		}
 		$this->addElements($elements, $asIcons);
 	}
 	protected function createItem($value){
@@ -50,8 +51,9 @@ 
 	 */
 	public function addElement($element, $asIcon=false) {
 		$item=$this->addItem($element);
-		if($asIcon && $item instanceof HtmlButton)
-			$item->asIcon($element);
+		if($asIcon && $item instanceof HtmlButton) {
+					$item->asIcon($element);
+		}
 		return $item;
 	}
 
@@ -79,8 +81,9 @@ 
 
 	public function asIcons() {
 		foreach ( $this->content as $item ) {
-			if($item instanceof HtmlButton)
-			$item->asIcon($item->getContent());
+			if($item instanceof HtmlButton) {
+						$item->asIcon($item->getContent());
+			}
 		}
 		return $this->addToProperty("class", "icons");
 	}
@@ -92,8 +95,9 @@ 
 	 */
 	public function addIcons($icons){
 		foreach ( $this->content as $index=>$item ) {
-			if($item instanceof HtmlButton && isset($icons[$index]))
-				$item->addIcon($icons[$index]);
+			if($item instanceof HtmlButton && isset($icons[$index])) {
+							$item->addIcon($icons[$index]);
+			}
 		}
 		return $this;
 	}

Ajax/semantic/html/content/view/HtmlViewGroups.php

Spacing +5 added lines, -5 removed lines

@@ -9,7 +9,7 @@ 
 
 abstract class HtmlViewGroups extends HtmlSemCollection {
 
-	public function __construct($identifier, $uiClass,$items=array()) {
+	public function __construct($identifier, $uiClass, $items=array()) {
 		parent::__construct($identifier, "div", $uiClass);
 		$this->addItems($items);
 	}
@@ -41,7 +41,7 @@ 
 	 * @param int $wide
 	 */
 	public function setWide($wide) {
-		$wide=Wide::getConstants()["W" . $wide];
+		$wide=Wide::getConstants()["W".$wide];
 		return $this->addToPropertyCtrl("class", $wide, Wide::getConstants());
 	}
 
@@ -50,7 +50,7 @@ 
 	/**
 	 * @return HtmlViewGroups
 	 */
-	public function getItem($index){
+	public function getItem($index) {
 		return parent::getItem($index);
 	}
 
@@ -58,7 +58,7 @@ 
 		$item=$this->getItem($itemIndex);
 		if (isset($item)) {
 			$content=$item->getContent();
-			if(isset($content[$contentIndex]))
+			if (isset($content[$contentIndex]))
 				return $content[$contentIndex];
 		}
 	}
@@ -67,7 +67,7 @@ 
 		return $this->addItem($function($object));
 	}
 
-	public function run(JsUtils $js){
+	public function run(JsUtils $js) {
 		$result=parent::run($js);
 		return $result->setItemSelector(".item");
 	}

Braces +6 added lines, -4 removed lines

@@ -31,8 +31,9 @@ 
 			if (isset($extra)) {
 				$result->addExtraContent($extra);
 			}
-		} else
-			$result->addItemContent($value);
+		} else {
+					$result->addItemContent($value);
+		}
 		return $result;
 	}
 
@@ -58,8 +59,9 @@ 
 		$item=$this->getItem($itemIndex);
 		if (isset($item)) {
 			$content=$item->getContent();
-			if(isset($content[$contentIndex]))
-				return $content[$contentIndex];
+			if(isset($content[$contentIndex])) {
+							return $content[$contentIndex];
+			}
 		}
 	}
 

Ajax/semantic/html/content/view/HtmlViewContent.php

Spacing +19 added lines, -19 removed lines

@@ -13,11 +13,11 @@ 
 class HtmlViewContent extends HtmlSemDoubleElement {
 	use ContentPartTrait;
 	public function __construct($identifier, $content=array()) {
-		parent::__construct($identifier, "div", "content",[]);
+		parent::__construct($identifier, "div", "content", []);
 		$this->setContent($content);
 	}
 
-	public function setContent($value){
+	public function setContent($value) {
 		if (\is_array($value)) {
 			$header=JArray::getValue($value, "header", 0);
 			$metas=JArray::getValue($value, "metas", 1);
@@ -27,24 +27,24 @@ 
 			if (isset($image)) {
 				$this->addImage($image);
 			}
-			$this->addHeaderContent($header, $metas, $description,$extra);
+			$this->addHeaderContent($header, $metas, $description, $extra);
 		} else
 			$this->addContent($value);
 	}
 
 	public function addElement($content, $baseClass="") {
 		$count=\sizeof($this->content);
-		$result=new HtmlViewContent("element-" . $count . "-" . $this->identifier, $content);
+		$result=new HtmlViewContent("element-".$count."-".$this->identifier, $content);
 		$result->setClass($baseClass);
 		$this->addContent($result);
 		return $result;
 	}
 
 	public function addMeta($value, $direction=Direction::LEFT) {
-		if (\array_key_exists("meta", $this->content) === false) {
-			$this->content["meta"]=new HtmlSemDoubleElement("meta-" . $this->identifier, "div", "meta", array ());
+		if (\array_key_exists("meta", $this->content)===false) {
+			$this->content["meta"]=new HtmlSemDoubleElement("meta-".$this->identifier, "div", "meta", array());
 		}
-		if ($direction === Direction::RIGHT) {
+		if ($direction===Direction::RIGHT) {
 			$value=new HtmlSemDoubleElement("", "span", "", $value);
 			$value->setFloated($direction);
 		}
@@ -53,8 +53,8 @@ 
 	}
 
 	public function addExtra($value) {
-		if (\array_key_exists("extra", $this->content) === false) {
-			$this->content["extra"]=new HtmlSemDoubleElement("extra-" . $this->identifier, "div", "extra", array ());
+		if (\array_key_exists("extra", $this->content)===false) {
+			$this->content["extra"]=new HtmlSemDoubleElement("extra-".$this->identifier, "div", "extra", array());
 		}
 		$this->content["extra"]->addContent($value);
 		return $this->content["extra"];
@@ -75,15 +75,15 @@ 
 	 * @param boolean $before
 	 * @return HtmlButtonGroups
 	 */
-	public function addContentButtons($elements=array(), $asIcons=false,$part="extra",$before=false){
-		$buttons=new HtmlButtonGroups("buttons-".$this->identifier,$elements,$asIcons);
-		$this->addElementInPart($buttons,$part, $before,true);
+	public function addContentButtons($elements=array(), $asIcons=false, $part="extra", $before=false) {
+		$buttons=new HtmlButtonGroups("buttons-".$this->identifier, $elements, $asIcons);
+		$this->addElementInPart($buttons, $part, $before, true);
 		return $buttons;
 	}
 
 	public function addMetas($metas) {
 		if (\is_array($metas)) {
-			foreach ( $metas as $meta ) {
+			foreach ($metas as $meta) {
 				$this->addMeta($meta);
 			}
 		} else
@@ -92,7 +92,7 @@ 
 	}
 
 	public function addContentIcon($icon, $caption=NULL, $direction=Direction::LEFT) {
-		if ($direction === Direction::RIGHT) {
+		if ($direction===Direction::RIGHT) {
 			if (isset($caption)) {
 				$result=new HtmlSemDoubleElement("", "span", "", $caption);
 				$result->addIcon($icon);
@@ -110,7 +110,7 @@ 
 	}
 
 	public function addContentText($caption, $direction=Direction::LEFT) {
-		if ($direction === Direction::RIGHT) {
+		if ($direction===Direction::RIGHT) {
 			$result=new HtmlSemDoubleElement("", "span", "", $caption);
 			$this->addContent($result);
 			$result->setFloated($direction);
@@ -120,20 +120,20 @@ 
 	}
 
 	public function addContentIcons($icons, $direction=Direction::LEFT) {
-		foreach ( $icons as $icon ) {
+		foreach ($icons as $icon) {
 			$this->addContentIcon($icon, NULL, $direction);
 		}
 		return $this;
 	}
 
-	public function addHeaderContent($header, $metas=array(), $description=NULL,$extra=NULL) {
-		if(isset($header))
+	public function addHeaderContent($header, $metas=array(), $description=NULL, $extra=NULL) {
+		if (isset($header))
 			$this->addElement($header, "header");
 		$this->addMetas($metas);
 		if (isset($description)) {
 			$this->addElement($description, "description");
 		}
-		if(isset($extra)){
+		if (isset($extra)) {
 			$this->addExtra($extra);
 		}
 		return $this;

Braces +15 added lines, -10 removed lines

@@ -28,8 +28,9 @@ 
 				$this->addImage($image);
 			}
 			$this->addHeaderContent($header, $metas, $description,$extra);
-		} else
-			$this->addContent($value);
+		} else {
+					$this->addContent($value);
+		}
 	}
 
 	public function addElement($content, $baseClass="") {
@@ -62,8 +63,9 @@ 
 
 	public function addImage($src="", $alt="", $size=NULL) {
 		$image=new HtmlImg("img-", $src, $alt);
-		if (isset($size))
-			$image->setSize($size);
+		if (isset($size)) {
+					$image->setSize($size);
+		}
 		$this->content['image']=$image;
 		return $image;
 	}
@@ -86,8 +88,9 @@ 
 			foreach ( $metas as $meta ) {
 				$this->addMeta($meta);
 			}
-		} else
-			$this->addMeta($metas);
+		} else {
+					$this->addMeta($metas);
+		}
 		return $this;
 	}
 
@@ -114,8 +117,9 @@ 
 			$result=new HtmlSemDoubleElement("", "span", "", $caption);
 			$this->addContent($result);
 			$result->setFloated($direction);
-		} else
-			$result=$this->addContent($caption);
+		} else {
+					$result=$this->addContent($caption);
+		}
 		return $result;
 	}
 
@@ -127,8 +131,9 @@ 
 	}
 
 	public function addHeaderContent($header, $metas=array(), $description=NULL,$extra=NULL) {
-		if(isset($header))
-			$this->addElement($header, "header");
+		if(isset($header)) {
+					$this->addElement($header, "header");
+		}
 		$this->addMetas($metas);
 		if (isset($description)) {
 			$this->addElement($description, "description");

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

Braces +9 added lines, -7 removed lines

@@ -49,7 +49,7 @@ 
 			foreach ($ajaxSubmit as $ajaxSubmitItem){
 				$compilation.=$ajaxSubmitItem->compile($js);
 			}
-		}elseif($ajaxSubmit instanceof AjaxCall){
+		} elseif($ajaxSubmit instanceof AjaxCall){
 			$compilation=$ajaxSubmit->compile($js);
 		}
 		$compilation=str_ireplace("\"","%quote%", $compilation);
@@ -67,8 +67,9 @@ 
 
 	public function setAttached($value=true){
 		$form=$this->getForm();
-		if($value)
-			$form->addToPropertyCtrl("class", "attached", array ("attached" ));
+		if($value) {
+					$form->addToPropertyCtrl("class", "attached", array ("attached" ));
+		}
 		return $form;
 	}
 
@@ -90,10 +91,11 @@ 
 	 */
 	public function submitOn($event,$identifierOrElement,$url,$responseElement,$parameters=NULL){
 		$form=$this->getForm();
-		if($identifierOrElement  instanceof BaseHtml)
-			$elem=$identifierOrElement;
-		else
-			$elem=$form->getElementById($identifierOrElement, $form->getContent());
+		if($identifierOrElement  instanceof BaseHtml) {
+					$elem=$identifierOrElement;
+		} else {
+					$elem=$form->getElementById($identifierOrElement, $form->getContent());
+		}
 		if(isset($elem)){
 			$this->_buttonAsSubmit($elem, $event,$url,$responseElement,$parameters);
 		}

Spacing +43 added lines, -43 removed lines

@@ -15,32 +15,32 @@ 
  * @author jc
  *
  */
-trait FormTrait{
+trait FormTrait {
 
 	/**
 	 * @return HtmlForm
 	 */
 	abstract protected function getForm();
 
-	protected function addCompoValidation(Form $compo,HtmlFormField $field){
+	protected function addCompoValidation(Form $compo, HtmlFormField $field) {
 		$validation=$field->getValidation();
-		if(isset($validation)){
+		if (isset($validation)) {
 			$validation->setIdentifier($field->getDataField()->getIdentifier());
 			$compo->addFieldValidation($validation);
 		}
 		return $compo;
 	}
 	
-	protected function addExtraCompoValidation(Form $compo,FieldValidation $validation){
+	protected function addExtraCompoValidation(Form $compo, FieldValidation $validation) {
 		$compo->addFieldValidation($validation);
 		return $compo;
 	}
 
-	protected function _runValidationParams(Form &$compo,JsUtils $js=NULL){
+	protected function _runValidationParams(Form &$compo, JsUtils $js=NULL) {
 		$form=$this->getForm();
 		$params=$form->getValidationParams();
-		if(isset($params["_ajaxSubmit"])){
-			$compilation=$this->_compileAjaxSubmit($params["_ajaxSubmit"],$js);
+		if (isset($params["_ajaxSubmit"])) {
+			$compilation=$this->_compileAjaxSubmit($params["_ajaxSubmit"], $js);
 			$this->onSuccess($compilation);
 			$form->removeValidationParam("_ajaxSubmit");
 		}
@@ -49,16 +49,16 @@ 
 		$form->addEventsOnRun($js);
 	}
 
-	protected function _compileAjaxSubmit($ajaxSubmit,JsUtils $js=null){
+	protected function _compileAjaxSubmit($ajaxSubmit, JsUtils $js=null) {
 		$compilation="";
-		if(\is_array($ajaxSubmit)){
-			foreach ($ajaxSubmit as $ajaxSubmitItem){
+		if (\is_array($ajaxSubmit)) {
+			foreach ($ajaxSubmit as $ajaxSubmitItem) {
 				$compilation.=$ajaxSubmitItem->compile($js);
 			}
-		}elseif($ajaxSubmit instanceof AjaxCall){
+		}elseif ($ajaxSubmit instanceof AjaxCall) {
 			$compilation=$ajaxSubmit->compile($js);
 		}
-		$compilation=str_ireplace("\"","%quote%", $compilation);
+		$compilation=str_ireplace("\"", "%quote%", $compilation);
 		return $compilation;
 	}
 
@@ -71,14 +71,14 @@ 
 		return $this;
 	}
 
-	public function setAttached($value=true){
+	public function setAttached($value=true) {
 		$form=$this->getForm();
-		if($value)
-			$form->addToPropertyCtrl("class", "attached", array ("attached" ));
+		if ($value)
+			$form->addToPropertyCtrl("class", "attached", array("attached"));
 		return $form;
 	}
 
-	public function addErrorMessage(){
+	public function addErrorMessage() {
 		return $this->getForm()->addContent((new HtmlMessage(""))->setError());
 	}
 
@@ -94,48 +94,48 @@ 
 	 * @param array $parameters
 	 * @return HtmlForm
 	 */
-	public function submitOn($event,$identifierOrElement,$url,$responseElement,$parameters=NULL){
+	public function submitOn($event, $identifierOrElement, $url, $responseElement, $parameters=NULL) {
 		$form=$this->getForm();
-		if($identifierOrElement  instanceof BaseHtml)
+		if ($identifierOrElement  instanceof BaseHtml)
 			$elem=$identifierOrElement;
 		else
 			$elem=$form->getElementById($identifierOrElement, $form->getContent());
-		if(isset($elem)){
-			$this->_buttonAsSubmit($elem, $event,$url,$responseElement,$parameters);
+		if (isset($elem)) {
+			$this->_buttonAsSubmit($elem, $event, $url, $responseElement, $parameters);
 		}
 		return $form;
 	}
 
-	public function submitOnClick($identifier,$url,$responseElement,$parameters=NULL){
-		return $this->submitOn("click", $identifier, $url, $responseElement,$parameters);
+	public function submitOnClick($identifier, $url, $responseElement, $parameters=NULL) {
+		return $this->submitOn("click", $identifier, $url, $responseElement, $parameters);
 	}
 
-	public function addSubmit($identifier,$value,$cssStyle=NULL,$url=NULL,$responseElement=NULL,$parameters=NULL){
-		$bt=$this->getForm()->addButton($identifier, $value,$cssStyle);
-		return $this->_buttonAsSubmit($bt, "click",$url,$responseElement,$parameters);
+	public function addSubmit($identifier, $value, $cssStyle=NULL, $url=NULL, $responseElement=NULL, $parameters=NULL) {
+		$bt=$this->getForm()->addButton($identifier, $value, $cssStyle);
+		return $this->_buttonAsSubmit($bt, "click", $url, $responseElement, $parameters);
 	}
 
-	protected function _buttonAsSubmit(BaseHtml &$button,$event,$url,$responseElement=NULL,$parameters=NULL){
+	protected function _buttonAsSubmit(BaseHtml &$button, $event, $url, $responseElement=NULL, $parameters=NULL) {
 		$form=$this->getForm();
-		if(isset($url) && isset($responseElement)){
-			$button->addEvent($event, "$('#".$form->getIdentifier()."').form('validate form');",true,true);
-			$this->setSubmitParams($url,$responseElement,$parameters);
+		if (isset($url) && isset($responseElement)) {
+			$button->addEvent($event, "$('#".$form->getIdentifier()."').form('validate form');", true, true);
+			$this->setSubmitParams($url, $responseElement, $parameters);
 		}
 		return $button;
 	}
 
-	public function setSubmitParams($url,$responseElement=NULL,$parameters=NULL){
+	public function setSubmitParams($url, $responseElement=NULL, $parameters=NULL) {
 		$form=$this->getForm();
-		$params=["form"=>$form->getIdentifier(),"responseElement"=>$responseElement,"url"=>$url,"stopPropagation"=>true];
-		if(\is_array($parameters)){
-			$params=\array_merge($params,$parameters);
+		$params=["form"=>$form->getIdentifier(), "responseElement"=>$responseElement, "url"=>$url, "stopPropagation"=>true];
+		if (\is_array($parameters)) {
+			$params=\array_merge($params, $parameters);
 		}
 		$form->addValidationParam("_ajaxSubmit", new AjaxCall("postForm", $params));
 		return $this;
 	}
 
-	public function addReset($identifier,$value,$cssStyle=NULL){
-		$bt=$this->getForm()->addButton($identifier, $value,$cssStyle);
+	public function addReset($identifier, $value, $cssStyle=NULL) {
+		$bt=$this->getForm()->addButton($identifier, $value, $cssStyle);
 		$bt->setProperty("type", "reset");
 		return $bt;
 	}
@@ -145,7 +145,7 @@ 
 	 * @param string $jsCode
 	 * @return \Ajax\semantic\html\collections\form\HtmlForm
 	 */
-	public function onValid($jsCode){
+	public function onValid($jsCode) {
 		$form=$this->getForm();
 		$form->addValidationParam("onValid", "%function(){".$jsCode."}%");
 		return $form;
@@ -156,27 +156,27 @@ 
 	 * @param string $jsCode can use event and fields parameters
 	 * @return HtmlForm
 	 */
-	public function onSuccess($jsCode){
+	public function onSuccess($jsCode) {
 		$form=$this->getForm();
-		$form->addValidationParam("onSuccess", $jsCode,"%function(event,fields){","}%");
+		$form->addValidationParam("onSuccess", $jsCode, "%function(event,fields){", "}%");
 		return $form;
 	}
 	
-	public function addExtraFieldRules($fieldname,$rules){
+	public function addExtraFieldRules($fieldname, $rules) {
 		$form=$this->getForm();
 		$fv=$form->getExtraFieldValidation($fieldname);
-		foreach ($rules as $rule){
+		foreach ($rules as $rule) {
 			$fv->addRule($rule);
 		}
 	}
 	
-	public function addExtraFieldRule($fieldname,$type,$prompt=NULL,$value=NULL){
+	public function addExtraFieldRule($fieldname, $type, $prompt=NULL, $value=NULL) {
 		$form=$this->getForm();
 		$fv=$form->getExtraFieldValidation($fieldname);
-		$fv->addRule($type,$prompt,$value);
+		$fv->addRule($type, $prompt, $value);
 	}
 	
-	public function setOptional($fieldname,$optional=true){
+	public function setOptional($fieldname, $optional=true) {
 		$form=$this->getForm();
 		$fv=$form->getExtraFieldValidation($fieldname);
 		$fv->setOptional($optional);

Ajax/semantic/widgets/base/InstanceViewer.php

Spacing +91 added lines, -91 removed lines

@@ -19,220 +19,220 @@ 
 
 	public static $index=0;
 
-	public function __construct($identifier,$instance=NULL,$captions=NULL){
+	public function __construct($identifier, $instance=NULL, $captions=NULL) {
 		$this->widgetIdentifier=$identifier;
 		$this->values=[];
 		$this->afterCompile=[];
-		if(isset($instance))
+		if (isset($instance))
 			$this->setInstance($instance);
 		$this->setCaptions($captions);
 		$this->captionCallback=NULL;
-		$this->defaultValueFunction=function($name,$value){return $value;};
+		$this->defaultValueFunction=function($name, $value) {return $value; };
 	}
 
-	public function moveFieldTo($from,$to){
-		if(JArray::moveElementTo($this->visibleProperties, $from, $to)){
+	public function moveFieldTo($from, $to) {
+		if (JArray::moveElementTo($this->visibleProperties, $from, $to)) {
 			return JArray::moveElementTo($this->values, $from, $to);
 		}
 		return false;
 	}
 
-	public function swapFields($index1,$index2){
-		if(JArray::swapElements($this->visibleProperties, $index1, $index2)){
+	public function swapFields($index1, $index2) {
+		if (JArray::swapElements($this->visibleProperties, $index1, $index2)) {
 			return JArray::swapElements($this->values, $index1, $index2);
 		}
 		return false;
 	}
 
-	public function removeField($index){
-		\array_splice($this->visibleProperties,$index,1);
-		\array_splice($this->values,$index,1);
-		\array_splice($this->captions,$index,1);
+	public function removeField($index) {
+		\array_splice($this->visibleProperties, $index, 1);
+		\array_splice($this->values, $index, 1);
+		\array_splice($this->captions, $index, 1);
 		return $this;
 	}
 
-	public function getValues(){
+	public function getValues() {
 		$values=[];
 		$index=0;
 		$count=$this->count();
-		while($index<$count){
+		while ($index<$count) {
 			$values[]=$this->getValue($index++);
 		}
 		return $values;
 	}
 
-	public function getIdentifier($index=NULL){
-		if(!isset($index))
+	public function getIdentifier($index=NULL) {
+		if (!isset($index))
 			$index=self::$index;
 		$value=$index;
-		if(isset($this->values["identifier"])){
-			if(\is_string($this->values["identifier"]))
+		if (isset($this->values["identifier"])) {
+			if (\is_string($this->values["identifier"]))
 				$value=JReflection::callMethod($this->instance, $this->values["identifier"], []);
 			else
-				$value=$this->values["identifier"]($index,$this->instance);
+				$value=$this->values["identifier"]($index, $this->instance);
 		}
 		return $value;
 	}
 
-	public function getValue($index){
+	public function getValue($index) {
 		$property=$this->properties[$index];
 		return $this->_getValue($property, $index);
 	}
 
-	protected function _beforeAddProperty($index,&$field){
+	protected function _beforeAddProperty($index, &$field) {
 
 	}
 
-	protected function _getDefaultValue($name,$value,$index){
+	protected function _getDefaultValue($name, $value, $index) {
 		$func=$this->defaultValueFunction;
-		return $func($name,$value,$index,$this->instance);
+		return $func($name, $value, $index, $this->instance);
 	}
 
-	protected function _getPropertyValue(\ReflectionProperty $property){
+	protected function _getPropertyValue(\ReflectionProperty $property) {
 		$property->setAccessible(true);
 		return $property->getValue($this->instance);
 	}
 
-	protected function _getValue($property,$index){
+	protected function _getValue($property, $index) {
 		$value=null;
 		$propertyName=$property;
-		if($property instanceof \ReflectionProperty){
+		if ($property instanceof \ReflectionProperty) {
 			$value=$this->_getPropertyValue($property);
 			$propertyName=$property->getName();
-		}elseif(\is_callable($property) && array_search($property, ["system"])===false)
+		}elseif (\is_callable($property) && array_search($property, ["system"])===false)
 			$value=$property($this->instance);
-		elseif(\is_array($property)){
-			$values=\array_map(function($v) use ($index){return $this->_getValue($v, $index);}, $property);
+		elseif (\is_array($property)) {
+			$values=\array_map(function($v) use ($index){return $this->_getValue($v, $index); }, $property);
 			$value=\implode("", $values);
-		}elseif(\is_string($property)){
+		}elseif (\is_string($property)) {
 			$value=$property;
-			if(isset($this->instance->{$property})){
+			if (isset($this->instance->{$property})) {
 				$value=$this->instance->{$property};
-			}elseif(\method_exists($this->instance, $getter=JReflection::getterName($property))){
+			}elseif (\method_exists($this->instance, $getter=JReflection::getterName($property))) {
 				$value=JReflection::callMethod($this->instance, $getter, []);
 			}
 		}
 		return $this->_postGetValue($index, $propertyName, $value);
 	}
 
-	protected function _postGetValue($index,$propertyName,$value){
-		if(isset($this->values[$index])){
-			$value= $this->values[$index]($value,$this->instance,$index,self::$index);
-		}else{
-			$value=$this->_getDefaultValue($propertyName,$value, $index);
+	protected function _postGetValue($index, $propertyName, $value) {
+		if (isset($this->values[$index])) {
+			$value=$this->values[$index]($value, $this->instance, $index, self::$index);
+		} else {
+			$value=$this->_getDefaultValue($propertyName, $value, $index);
 		}
-		if(isset($this->afterCompile[$index])){
-			if(\is_callable($this->afterCompile[$index])){
-				$this->afterCompile[$index]($value,$this->instance,self::$index);
+		if (isset($this->afterCompile[$index])) {
+			if (\is_callable($this->afterCompile[$index])) {
+				$this->afterCompile[$index]($value, $this->instance, self::$index);
 			}
 		}
 		return $value;
 	}
 
-	public function insertField($index,$field){
-		array_splice( $this->visibleProperties, $index, 0, $field );
+	public function insertField($index, $field) {
+		array_splice($this->visibleProperties, $index, 0, $field);
 		return $this;
 	}
 
-	public function insertInField($index,$field){
+	public function insertInField($index, $field) {
 		$vb=$this->visibleProperties;
-		if(isset($vb[$index])){
-			if(\is_array($vb[$index])){
+		if (isset($vb[$index])) {
+			if (\is_array($vb[$index])) {
 				$this->visibleProperties[$index][]=$field;
-			}else{
-				$this->visibleProperties[$index]=[$vb[$index],$field];
+			} else {
+				$this->visibleProperties[$index]=[$vb[$index], $field];
 			}
-		}else{
+		} else {
 			return $this->insertField($index, $field);
 		}
 		return $this;
 	}
 
-	public function addField($field){
+	public function addField($field) {
 		$this->visibleProperties[]=$field;
 		return $this;
 	}
 
-	public function addFields($fields){
-		$this->visibleProperties=\array_merge($this->visibleProperties,$fields);
+	public function addFields($fields) {
+		$this->visibleProperties=\array_merge($this->visibleProperties, $fields);
 		return $this;
 	}
 
-	public function count(){
+	public function count() {
 		return \sizeof($this->properties);
 	}
 
-	public function visiblePropertiesCount(){
+	public function visiblePropertiesCount() {
 		return \sizeof($this->visibleProperties);
 	}
 
-	public function getProperty($index){
+	public function getProperty($index) {
 		return $this->properties[$index];
 	}
 
-	public function getFieldName($index){
+	public function getFieldName($index) {
 		$property=$this->getProperty($index);
-		if($property instanceof \ReflectionProperty){
+		if ($property instanceof \ReflectionProperty) {
 			$result=$property->getName();
-		}elseif(\is_callable($property)){
+		}elseif (\is_callable($property)) {
 			$result=$this->visibleProperties[$index];
-		}else{
+		} else {
 			$result=$property;
 		}
 		return $result;
 	}
 
 
-	protected function showableProperty(\ReflectionProperty $rProperty){
-		return JString::startswith($rProperty->getName(),"_")===false;
+	protected function showableProperty(\ReflectionProperty $rProperty) {
+		return JString::startswith($rProperty->getName(), "_")===false;
 	}
 
 	public function setInstance($instance) {
-		if(\is_string($instance)){
+		if (\is_string($instance)) {
 			$instance=new $instance();
 		}
 		$this->instance=$instance;
 		$this->properties=[];
 		$this->reflect=new \ReflectionClass($instance);
-		if(JArray::count($this->visibleProperties)===0){
+		if (JArray::count($this->visibleProperties)===0) {
 			$this->properties=$this->getDefaultProperties();
-		}else{
-			foreach ($this->visibleProperties as $property){
+		} else {
+			foreach ($this->visibleProperties as $property) {
 				$this->setInstanceProperty($property);
 			}
 		}
 		return $this;
 	}
 
-	private function setInstanceProperty($property){
-		if(\is_callable($property)){
+	private function setInstanceProperty($property) {
+		if (\is_callable($property)) {
 			$this->properties[]=$property;
-		}elseif(\is_string($property)){
-			try{
+		}elseif (\is_string($property)) {
+			try {
 				$this->_beforeAddProperty(\sizeof($this->properties), $property);
 				$rProperty=$this->reflect->getProperty($property);
 				$this->properties[]=$rProperty;
-			}catch(\Exception $e){
+			}catch (\Exception $e) {
 				$this->_beforeAddProperty(\sizeof($this->properties), $property);
 				$this->properties[]=$property;
 			}
-		}elseif(\is_int($property)){
+		}elseif (\is_int($property)) {
 			$props=$this->getDefaultProperties();
-			if(isset($props[$property]))
+			if (isset($props[$property]))
 				$this->properties[]=$props[$property];
 				else
 					$this->properties[]=$property;
-		}else{
+		} else {
 			$this->properties[]=$property;
 		}
 	}
 
-	protected function getDefaultProperties(){
+	protected function getDefaultProperties() {
 		$result=[];
 		$properties=$this->reflect->getProperties();
-		foreach ($properties as $property){
+		foreach ($properties as $property) {
 			$showable=$this->showableProperty($property);
-			if($showable!==false){
+			if ($showable!==false) {
 				$result[]=$property;
 			}
 		}
@@ -244,12 +244,12 @@ 
 		return $this;
 	}
 
-	public function setValueFunction($index,$callback){
+	public function setValueFunction($index, $callback) {
 		$this->values[$index]=$callback;
 		return $this;
 	}
 
-	public function setIdentifierFunction($callback){
+	public function setIdentifierFunction($callback) {
 		$this->values["identifier"]=$callback;
 		return $this;
 	}
@@ -262,42 +262,42 @@ 
 		return $this->properties;
 	}
 
-	public function getCaption($index){
-		if(isset($this->captions[$index])){
+	public function getCaption($index) {
+		if (isset($this->captions[$index])) {
 			return $this->captions[$index];
 		}
-		if($this->properties[$index] instanceof \ReflectionProperty)
+		if ($this->properties[$index] instanceof \ReflectionProperty)
 			return $this->properties[$index]->getName();
-		elseif(\is_callable($this->properties[$index]))
+		elseif (\is_callable($this->properties[$index]))
 			return "";
 		else
 			return $this->properties[$index];
 	}
 
-	public function getCaptions(){
+	public function getCaptions() {
 		$count=$this->count();
-		if(isset($this->captions)){
-			$captions= \array_values($this->captions);
+		if (isset($this->captions)) {
+			$captions=\array_values($this->captions);
 			$captionsSize=\sizeof($captions);
-			for($i=$captionsSize;$i<$count;$i++){
+			for ($i=$captionsSize; $i<$count; $i++) {
 				$captions[]="";
 			}
-		}else{
+		} else {
 			$captions=[];
 			$index=0;
-			while($index<$count){
+			while ($index<$count) {
 				$captions[]=$this->getCaption($index++);
 			}
 		}
-		if(isset($this->captionCallback) && \is_callable($this->captionCallback)){
+		if (isset($this->captionCallback) && \is_callable($this->captionCallback)) {
 			$callback=$this->captionCallback;
-			$callback($captions,$this->instance);
+			$callback($captions, $this->instance);
 		}
 		return $captions;
 	}
 
-	public function setCaption($index,$caption){
-		if(isset($this->captions)===false)
+	public function setCaption($index, $caption) {
+		if (isset($this->captions)===false)
 			$this->captions=[];
 		$this->captions[$index]=$caption;
 		return $this;
@@ -315,7 +315,7 @@ 
 	 * @param callable $callback function called after the field compilation
 	 * @return InstanceViewer
 	 */
-	public function afterCompile($index,$callback){
+	public function afterCompile($index, $callback) {
 		$this->afterCompile[$index]=$callback;
 		return $this;
 	}

Braces +42 added lines, -36 removed lines

@@ -23,8 +23,9 @@ 
 		$this->widgetIdentifier=$identifier;
 		$this->values=[];
 		$this->afterCompile=[];
-		if(isset($instance))
-			$this->setInstance($instance);
+		if(isset($instance)) {
+					$this->setInstance($instance);
+		}
 		$this->setCaptions($captions);
 		$this->captionCallback=NULL;
 		$this->defaultValueFunction=function($name,$value){return $value;};
@@ -62,14 +63,16 @@ 
 	}
 
 	public function getIdentifier($index=NULL){
-		if(!isset($index))
-			$index=self::$index;
+		if(!isset($index)) {
+					$index=self::$index;
+		}
 		$value=$index;
 		if(isset($this->values["identifier"])){
-			if(\is_string($this->values["identifier"]))
-				$value=JReflection::callMethod($this->instance, $this->values["identifier"], []);
-			else
-				$value=$this->values["identifier"]($index,$this->instance);
+			if(\is_string($this->values["identifier"])) {
+							$value=JReflection::callMethod($this->instance, $this->values["identifier"], []);
+			} else {
+							$value=$this->values["identifier"]($index,$this->instance);
+			}
 		}
 		return $value;
 	}
@@ -99,16 +102,16 @@ 
 		if($property instanceof \ReflectionProperty){
 			$value=$this->_getPropertyValue($property);
 			$propertyName=$property->getName();
-		}elseif(\is_callable($property) && array_search($property, ["system"])===false)
-			$value=$property($this->instance);
-		elseif(\is_array($property)){
+		} elseif(\is_callable($property) && array_search($property, ["system"])===false) {
+					$value=$property($this->instance);
+		} elseif(\is_array($property)){
 			$values=\array_map(function($v) use ($index){return $this->_getValue($v, $index);}, $property);
 			$value=\implode("", $values);
-		}elseif(\is_string($property)){
+		} elseif(\is_string($property)){
 			$value=$property;
 			if(isset($this->instance->{$property})){
 				$value=$this->instance->{$property};
-			}elseif(\method_exists($this->instance, $getter=JReflection::getterName($property))){
+			} elseif(\method_exists($this->instance, $getter=JReflection::getterName($property))){
 				$value=JReflection::callMethod($this->instance, $getter, []);
 			}
 		}
@@ -118,7 +121,7 @@ 
 	protected function _postGetValue($index,$propertyName,$value){
 		if(isset($this->values[$index])){
 			$value= $this->values[$index]($value,$this->instance,$index,self::$index);
-		}else{
+		} else{
 			$value=$this->_getDefaultValue($propertyName,$value, $index);
 		}
 		if(isset($this->afterCompile[$index])){
@@ -139,10 +142,10 @@ 
 		if(isset($vb[$index])){
 			if(\is_array($vb[$index])){
 				$this->visibleProperties[$index][]=$field;
-			}else{
+			} else{
 				$this->visibleProperties[$index]=[$vb[$index],$field];
 			}
-		}else{
+		} else{
 			return $this->insertField($index, $field);
 		}
 		return $this;
@@ -174,9 +177,9 @@ 
 		$property=$this->getProperty($index);
 		if($property instanceof \ReflectionProperty){
 			$result=$property->getName();
-		}elseif(\is_callable($property)){
+		} elseif(\is_callable($property)){
 			$result=$this->visibleProperties[$index];
-		}else{
+		} else{
 			$result=$property;
 		}
 		return $result;
@@ -196,7 +199,7 @@ 
 		$this->reflect=new \ReflectionClass($instance);
 		if(JArray::count($this->visibleProperties)===0){
 			$this->properties=$this->getDefaultProperties();
-		}else{
+		} else{
 			foreach ($this->visibleProperties as $property){
 				$this->setInstanceProperty($property);
 			}
@@ -207,22 +210,23 @@ 
 	private function setInstanceProperty($property){
 		if(\is_callable($property)){
 			$this->properties[]=$property;
-		}elseif(\is_string($property)){
+		} elseif(\is_string($property)){
 			try{
 				$this->_beforeAddProperty(\sizeof($this->properties), $property);
 				$rProperty=$this->reflect->getProperty($property);
 				$this->properties[]=$rProperty;
-			}catch(\Exception $e){
+			} catch(\Exception $e){
 				$this->_beforeAddProperty(\sizeof($this->properties), $property);
 				$this->properties[]=$property;
 			}
-		}elseif(\is_int($property)){
+		} elseif(\is_int($property)){
 			$props=$this->getDefaultProperties();
-			if(isset($props[$property]))
-				$this->properties[]=$props[$property];
-				else
-					$this->properties[]=$property;
-		}else{
+			if(isset($props[$property])) {
+							$this->properties[]=$props[$property];
+			} else {
+									$this->properties[]=$property;
+				}
+		} else{
 			$this->properties[]=$property;
 		}
 	}
@@ -266,12 +270,13 @@ 
 		if(isset($this->captions[$index])){
 			return $this->captions[$index];
 		}
-		if($this->properties[$index] instanceof \ReflectionProperty)
-			return $this->properties[$index]->getName();
-		elseif(\is_callable($this->properties[$index]))
-			return "";
-		else
-			return $this->properties[$index];
+		if($this->properties[$index] instanceof \ReflectionProperty) {
+					return $this->properties[$index]->getName();
+		} elseif(\is_callable($this->properties[$index])) {
+					return "";
+		} else {
+					return $this->properties[$index];
+		}
 	}
 
 	public function getCaptions(){
@@ -282,7 +287,7 @@ 
 			for($i=$captionsSize;$i<$count;$i++){
 				$captions[]="";
 			}
-		}else{
+		} else{
 			$captions=[];
 			$index=0;
 			while($index<$count){
@@ -297,8 +302,9 @@ 
 	}
 
 	public function setCaption($index,$caption){
-		if(isset($this->captions)===false)
-			$this->captions=[];
+		if(isset($this->captions)===false) {
+					$this->captions=[];
+		}
 		$this->captions[$index]=$caption;
 		return $this;
 	}

Ajax/semantic/widgets/dataelement/DataElement.php

Spacing +21 added lines, -21 removed lines

@@ -22,56 +22,56 @@ 
 	protected $_colWidths;
 
 	public function __construct($identifier, $modelInstance=NULL) {
-		parent::__construct($identifier, null,$modelInstance);
-		$this->_init(new DeInstanceViewer($identifier), "table", new HtmlTable($identifier, 0,2), false);
+		parent::__construct($identifier, null, $modelInstance);
+		$this->_init(new DeInstanceViewer($identifier), "table", new HtmlTable($identifier, 0, 2), false);
 		$this->content["table"]->setDefinition();
 	}
 
-	public function compile(JsUtils $js=NULL,&$view=NULL){
-		if(!$this->_generated){
+	public function compile(JsUtils $js=NULL, &$view=NULL) {
+		if (!$this->_generated) {
 			$this->_instanceViewer->setInstance($this->_modelInstance);
 
 			$table=$this->content["table"];
 			$this->_generateContent($table);
 
-			if(isset($this->_toolbar)){
+			if (isset($this->_toolbar)) {
 				$this->_setToolbarPosition($table);
 			}
-			if(isset($this->_colWidths)){
+			if (isset($this->_colWidths)) {
 				$this->_applyStyleAttributes($table);
 			}
-			$this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE,"table",PositionInTable::AFTERTABLE]);
+			$this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE, "table", PositionInTable::AFTERTABLE]);
 			$this->_compileForm();
 			$this->_generated=true;
 		}
-		return parent::compile($js,$view);
+		return parent::compile($js, $view);
 	}
 
 	/**
 	 * @param HtmlTable $table
 	 */
-	protected function _generateContent($table){
-		$values= $this->_instanceViewer->getValues();
+	protected function _generateContent($table) {
+		$values=$this->_instanceViewer->getValues();
 		$captions=$this->_instanceViewer->getCaptions();
 		$count=$this->_instanceViewer->count();
 
-		for($i=0;$i<$count;$i++){
-			$table->addRow([$captions[$i],$values[$i]]);
+		for ($i=0; $i<$count; $i++) {
+			$table->addRow([$captions[$i], $values[$i]]);
 		}
 	}
 
-	protected function _applyStyleAttributes(HtmlTable $table){
+	protected function _applyStyleAttributes(HtmlTable $table) {
 		$table->setColWidths($this->_colWidths);
 	}
-	protected function _getFieldName($index){
+	protected function _getFieldName($index) {
 		return $this->_instanceViewer->getFieldName($index);
 	}
 
-	protected function _getFieldCaption($index){
+	protected function _getFieldCaption($index) {
 		return null;
 	}
 
-	protected function _getFieldIdentifier($prefix,$name=""){
+	protected function _getFieldIdentifier($prefix, $name="") {
 		return $this->identifier."-{$prefix}-".$name;
 	}
 
@@ -103,11 +103,11 @@ 
 		return $this;
 	}
 
-	public function asForm(){
+	public function asForm() {
 		return $this->getForm();
 	}
 
-	public function setColCaptionWidth($width){
+	public function setColCaptionWidth($width) {
 		$this->_colWidths[0]=$width;
 		return $this;
 	}
@@ -117,13 +117,13 @@ 
 		return $this;
 	}
 
-	public function setColWidths($widths){
+	public function setColWidths($widths) {
 		$this->_colWidths=$widths;
 		return $this;
 	}
 	
-	public function run(JsUtils $js){
-		if(JString::isNotNull($this->_identifier))
+	public function run(JsUtils $js) {
+		if (JString::isNotNull($this->_identifier))
 			$js->execOn("click", "#".$this->_identifier." .ui.toggle", 'var active=$(this).hasClass("active");$(this).children("i").toggleClass("up",active).toggleClass("down",!active);var nextTd=$(this).closest("td").next("td");nextTd.children(":not(.toggle-caption)").toggle(active);nextTd.children(".toggle-caption").toggle(!active);$(this).trigger({type:"toggled",active: active,caption: nextTd.children(".toggle-caption")});');
 		parent::run($js);
 	}

Braces +3 added lines, -2 removed lines

@@ -123,8 +123,9 @@
 	}
 	
 	public function run(JsUtils $js){
-		if(JString::isNotNull($this->_identifier))
-			$js->execOn("click", "#".$this->_identifier." .ui.toggle", 'var active=$(this).hasClass("active");$(this).children("i").toggleClass("up",active).toggleClass("down",!active);var nextTd=$(this).closest("td").next("td");nextTd.children(":not(.toggle-caption)").toggle(active);nextTd.children(".toggle-caption").toggle(!active);$(this).trigger({type:"toggled",active: active,caption: nextTd.children(".toggle-caption")});');
+		if(JString::isNotNull($this->_identifier)) {
+					$js->execOn("click", "#".$this->_identifier." .ui.toggle", 'var active=$(this).hasClass("active");$(this).children("i").toggleClass("up",active).toggleClass("down",!active);var nextTd=$(this).closest("td").next("td");nextTd.children(":not(.toggle-caption)").toggle(active);nextTd.children(".toggle-caption").toggle(!active);$(this).trigger({type:"toggled",active: active,caption: nextTd.children(".toggle-caption")});');
+		}
 		parent::run($js);
 	}
 }

Ajax/semantic/html/base/HtmlSemDoubleElement.php

Spacing +16 added lines, -16 removed lines

@@ -23,7 +23,7 @@ 
 	use BaseTrait;
 	protected $_popup=NULL;
 	protected $_dimmer=NULL;
-	protected $_params=array ();
+	protected $_params=array();
 
 
 	public function __construct($identifier, $tagName="p", $baseClass="ui", $content=NULL) {
@@ -79,7 +79,7 @@ 
 	 * @return HtmlDimmer
 	 */
 	public function addDimmer($params=array(), $content=NULL) {
-		$dimmer=new HtmlDimmer("dimmer-" . $this->identifier, $content);
+		$dimmer=new HtmlDimmer("dimmer-".$this->identifier, $content);
 		$dimmer->setParams($params);
 		$dimmer->setContainer($this);
 		$this->addContent($dimmer);
@@ -95,12 +95,12 @@ 
 	 */
 	public function addLabel($label, $before=false, $icon=NULL) {
 		$labelO=$label;
-		if (\is_object($label) === false) {
-			$labelO=new HtmlLabel("label-" . $this->identifier, $label);
+		if (\is_object($label)===false) {
+			$labelO=new HtmlLabel("label-".$this->identifier, $label);
 			if (isset($icon))
 				$labelO->addIcon($icon);
 		} else {
-			$labelO->addToPropertyCtrl("class", "label", array ("label" ));
+			$labelO->addToPropertyCtrl("class", "label", array("label"));
 		}
 		$this->addContent($labelO, $before);
 		return $labelO;
@@ -114,9 +114,9 @@ 
 	 * @param string $icon
 	 * @return HtmlSemDoubleElement
 	 */
-	public function attachLabel($label,$side=Side::TOP,$direction=Direction::NONE,$icon=NULL){
-		$label=$this->addLabel($label,true,$icon);
-		$label->setAttached($side,$direction);
+	public function attachLabel($label, $side=Side::TOP, $direction=Direction::NONE, $icon=NULL) {
+		$label=$this->addLabel($label, true, $icon);
+		$label->setAttached($side, $direction);
 		return $this;
 	}
 
@@ -124,10 +124,10 @@ 
 	 * Transforms the element into a link
 	 * @return HtmlSemDoubleElement
 	 */
-	public function asLink($href=NULL,$target=NULL) {
+	public function asLink($href=NULL, $target=NULL) {
 		if (isset($href))
 			$this->setProperty("href", $href);
-		if(isset($target))
+		if (isset($target))
 			$this->setProperty("target", $target);
 		return $this->setTagName("a");
 	}
@@ -139,9 +139,9 @@ 
 	 */
 	public function jsShowDimmer($show=true) {
 		$status="hide";
-		if ($show === true)
+		if ($show===true)
 			$status="show";
-		return '$("#.' . $this->identifier . ').dimmer("' . $status . '");';
+		return '$("#.'.$this->identifier.').dimmer("'.$status.'");';
 	}
 
 	/**
@@ -149,7 +149,7 @@ 
 	 * @see BaseHtml::compile()
 	 */
 	public function compile(JsUtils $js=NULL, &$view=NULL) {
-		if (isset($this->_popup)){
+		if (isset($this->_popup)) {
 			$this->_popup->compile($js);
 		}
 		return parent::compile($js, $view);
@@ -160,7 +160,7 @@ 
 	 * @see HtmlDoubleElement::run()
 	 */
 	public function run(JsUtils $js) {
-		$this->_bsComponent=$js->semantic()->generic("#" . $this->identifier);
+		$this->_bsComponent=$js->semantic()->generic("#".$this->identifier);
 		parent::run($js);
 		$this->addEventsOnRun($js);
 		if (isset($this->_popup)) {
@@ -169,8 +169,8 @@ 
 		return $this->_bsComponent;
 	}
 
-	public function addList($items,$ordered=false){
-		$list=new HtmlList("list-".$this->identifier,$items);
+	public function addList($items, $ordered=false) {
+		$list=new HtmlList("list-".$this->identifier, $items);
 		$list->setOrdered($ordered);
 		$list->setClass("ui list");
 		$this->addContent($list);

Braces +15 added lines, -10 removed lines

@@ -41,8 +41,9 @@ 
 	 * @param string $popupEvent
 	 */
 	public function setPopupAttributes($variation=NULL, $popupEvent=NULL) {
-		if (isset($this->_popup))
-			$this->_popup->setAttributes($variation, $popupEvent);
+		if (isset($this->_popup)) {
+					$this->_popup->setAttributes($variation, $popupEvent);
+		}
 	}
 
 	/**
@@ -97,8 +98,9 @@ 
 		$labelO=$label;
 		if (\is_object($label) === false) {
 			$labelO=new HtmlLabel("label-" . $this->identifier, $label);
-			if (isset($icon))
-				$labelO->addIcon($icon);
+			if (isset($icon)) {
+							$labelO->addIcon($icon);
+			}
 		} else {
 			$labelO->addToPropertyCtrl("class", "label", array ("label" ));
 		}
@@ -125,10 +127,12 @@ 
 	 * @return HtmlSemDoubleElement
 	 */
 	public function asLink($href=NULL,$target=NULL) {
-		if (isset($href))
-			$this->setProperty("href", $href);
-		if(isset($target))
-			$this->setProperty("target", $target);
+		if (isset($href)) {
+					$this->setProperty("href", $href);
+		}
+		if(isset($target)) {
+					$this->setProperty("target", $target);
+		}
 		return $this->setTagName("a");
 	}
 
@@ -139,8 +143,9 @@ 
 	 */
 	public function jsShowDimmer($show=true) {
 		$status="hide";
-		if ($show === true)
-			$status="show";
+		if ($show === true) {
+					$status="show";
+		}
 		return '$("#.' . $this->identifier . ').dimmer("' . $status . '");';
 	}
 

Ajax/common/traits/JsUtilsInternalTrait.php

Spacing +9 added lines, -9 removed lines

@@ -2,10 +2,10 @@ 
 namespace Ajax\common\traits;
 use Ajax\common\BaseGui;
 
-trait JsUtilsInternalTrait{
+trait JsUtilsInternalTrait {
 
-	protected $jquery_code_for_compile=array ();
-	protected $jquery_code_for_compile_at_last=array ();
+	protected $jquery_code_for_compile=array();
+	protected $jquery_code_for_compile_at_last=array();
 
 	protected function _addToCompile($jsScript) {
 		$this->jquery_code_for_compile[]=$jsScript;
@@ -15,29 +15,29 @@ 
 	 * @param BaseGui $library
 	 * @param mixed $view
 	 */
-	protected function _compileLibrary(BaseGui $library, &$view=NULL){
-		if(isset($view))
+	protected function _compileLibrary(BaseGui $library, &$view=NULL) {
+		if (isset($view))
 			$library->compileHtml($this, $view);
 		if ($library->isAutoCompile()) {
 			$library->compile(true);
 		}
 	}
 
-	protected function defer($script){
+	protected function defer($script) {
 		$result="window.defer=function (method) {if (window.jQuery) method(); else setTimeout(function() { defer(method) }, 50);};";
 		$result.="window.defer(function(){".$script."})";
 		return $result;
 	}
 
-	protected function ready($script){
+	protected function ready($script) {
 		$result='$(document).ready(function() {'."\n";
 		$result.=$script.'})';
 		return $result;
 	}
 
 	protected function minify($input) {
-		if(trim($input) === "") return $input;
-		$input= preg_replace(
+		if (trim($input)==="") return $input;
+		$input=preg_replace(
 				array(
 						// Remove comment(s)
 						'#\s*("(?:[^"\\\]++|\\\.)*+"|\'(?:[^\'\\\\]++|\\\.)*+\')\s*|\s*\/\*(?!\!|@cc_on)(?>[\s\S]*?\*\/)\s*|\s*(?<![\:\=])\/\/.*(?=[\n\r]|$)|^\s*|\s*$#',

Braces +6 added lines, -3 removed lines

@@ -16,8 +16,9 @@ 
 	 * @param mixed $view
 	 */
 	protected function _compileLibrary(BaseGui $library, &$view=NULL){
-		if(isset($view))
-			$library->compileHtml($this, $view);
+		if(isset($view)) {
+					$library->compileHtml($this, $view);
+		}
 		if ($library->isAutoCompile()) {
 			$library->compile(true);
 		}
@@ -36,7 +37,9 @@ 
 	}
 
 	protected function minify($input) {
-		if(trim($input) === "") return $input;
+		if(trim($input) === "") {
+			return $input;
+		}
 		$input= preg_replace(
 				array(
 						// Remove comment(s)

Ajax/common/traits/JsUtilsAjaxTrait.php

Braces +29 added lines, -22 removed lines

@@ -32,7 +32,7 @@ 
 		$retour.="var self=this;\n";
 		if($hasLoader===true && JString::isNotNull($responseElement)){
 			$this->addLoading($retour, $responseElement,$ajaxLoader);
-		}elseif($hasLoader==="internal"){
+		} elseif($hasLoader==="internal"){
 			$retour.="\n$(this).addClass('loading');";
 		}
 		$ajaxParameters=["url"=>"url","method"=>"'".\strtoupper($method)."'"];
@@ -49,8 +49,9 @@ 
 		$retour.="$.ajax({".$this->implodeAjaxParameters($ajaxParameters)."}).done(function( data, textStatus, jqXHR ) {\n";
 		$retour.=$this->_getOnAjaxDone($responseElement, $jqueryDone,$ajaxTransition,$jsCallback,$hasLoader,($historize?$originalSelector:null))."});\n";
 		$retour=$this->_addJsCondition($jsCondition,$retour);
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$retour;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$retour;
+		}
 		return $retour;
 	}
 
@@ -86,12 +87,13 @@ 
 		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!=="")
-				$retour.="url=url+'".$slash."'+($(this).attr('".$attr."')||'');\n";
+			} elseif($attr!==null && $attr!=="") {
+							$retour.="url=url+'".$slash."'+($(this).attr('".$attr."')||'');\n";
+			}
 		}
 		return $retour;
 	}
@@ -105,13 +107,14 @@ 
 		if (JString::isNotNull($responseElement)) {
 			if(isset($ajaxTransition)){
 				$call=$this->setAjaxDataCall($ajaxTransition);
-			}elseif(isset($this->ajaxTransition)){
+			} elseif(isset($this->ajaxTransition)){
 				$call=$this->ajaxTransition;
 			}
-			if(\is_callable($call))
-				$retour="\t".$call($responseElement,$jqueryDone).";\n";
-			else
-				$retour="\t{$responseElement}.{$jqueryDone}( data );\n";
+			if(\is_callable($call)) {
+							$retour="\t".$call($responseElement,$jqueryDone).";\n";
+			} else {
+							$retour="\t{$responseElement}.{$jqueryDone}( data );\n";
+			}
 		}
 		if(isset($history)){
 			$retour.="\nwindow.history.pushState({'html':data,'selector':".Javascript::prep_value($history).",'jqueryDone':'{$jqueryDone}'},'', url);";
@@ -132,8 +135,9 @@ 
 	}
 
 	protected function _correctAjaxUrl($url) {
-		if ($url!=="/" && JString::endsWith($url, "/")===true)
-			$url=substr($url, 0, strlen($url)-1);
+		if ($url!=="/" && JString::endsWith($url, "/")===true) {
+					$url=substr($url, 0, strlen($url)-1);
+		}
 			if (strncmp($url, 'http://', 7)!=0&&strncmp($url, 'https://', 8)!=0) {
 				$url=$this->getUrl($url);
 			}
@@ -153,8 +157,9 @@ 
 	public static function _implodeParams($parameters){
 		$allParameters=[];
 		foreach ($parameters as $params){
-			if(isset($params))
-				$allParameters[]=self::_correctParams($params);
+			if(isset($params)) {
+							$allParameters[]=self::_correctParams($params);
+			}
 		}
 		return \implode("+'&'+", $allParameters);
 	}
@@ -180,8 +185,9 @@ 
 
 	protected function setDefaultParameters(&$parameters,$default){
 		foreach ($default as $k=>$v){
-			if(!isset($parameters[$k]))
-				$parameters[$k]=$v;
+			if(!isset($parameters[$k])) {
+							$parameters[$k]=$v;
+			}
 		}
 	}
 
@@ -299,7 +305,7 @@ 
 		if($context===null){
 			$parent="$('".$maskSelector."').parent()";
 			$newElm = "$('#'+newId)";
-		}else{
+		} else{
 			$parent=$context;
 			$newElm = $context.".find('#'+newId)";
 		}
@@ -490,7 +496,7 @@ 
 		$retour.="var self=this;\n";
 		if($hasLoader===true){
 			$this->addLoading($retour, $responseElement,$ajaxLoader);
-		}elseif($hasLoader==="internal"){
+		} elseif($hasLoader==="internal"){
 			$retour.="\n$(this).addClass('loading');";
 		}
 		$ajaxParameters=["url"=>"url","method"=>"'POST'","data"=>"params","async"=>$async];
@@ -508,8 +514,9 @@ 
 			$retour.="$('#".$form."').submit();\n";
 		}
 		$retour=$this->_addJsCondition($jsCondition, $retour);
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$retour;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$retour;
+		}
 		return $retour;
 	}
 

Spacing +112 added lines, -112 removed lines

@@ -17,10 +17,10 @@ 
 	protected $ajaxLoader="<div class=\"ui active centered inline text loader\">Loading</div>";
 
 	abstract public function getUrl($url);
-	abstract public function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false,$immediatly=true);
+	abstract public function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false, $immediatly=true);
 
-	protected function _ajax($method,$url,$responseElement="",$parameters=[]) {
-		if(isset($this->params["ajax"])){
+	protected function _ajax($method, $url, $responseElement="", $parameters=[]) {
+		if (isset($this->params["ajax"])) {
 			extract($this->params["ajax"]);
 		}
 		extract($parameters);
@@ -30,100 +30,100 @@ 
 		$originalSelector=$responseElement;
 		$responseElement=$this->_getResponseElement($responseElement);
 		$retour.="var self=this;\n";
-		if($hasLoader===true && JString::isNotNull($responseElement)){
-			$this->addLoading($retour, $responseElement,$ajaxLoader);
-		}elseif($hasLoader==="internal"){
+		if ($hasLoader===true && JString::isNotNull($responseElement)) {
+			$this->addLoading($retour, $responseElement, $ajaxLoader);
+		}elseif ($hasLoader==="internal") {
 			$retour.="\n$(this).addClass('loading');";
 		}
-		$ajaxParameters=["url"=>"url","method"=>"'".\strtoupper($method)."'"];
+		$ajaxParameters=["url"=>"url", "method"=>"'".\strtoupper($method)."'"];
 		
-		$ajaxParameters["async"]=($async?"true":"false");
+		$ajaxParameters["async"]=($async ? "true" : "false");
 		
-		if(isset($params)){
+		if (isset($params)) {
 			$ajaxParameters["data"]=self::_correctParams($params);
 		}
-		if(isset($headers)){
+		if (isset($headers)) {
 			$ajaxParameters["headers"]=$headers;
 		}
 		$this->createAjaxParameters($ajaxParameters, $parameters);
 		$retour.="$.ajax({".$this->implodeAjaxParameters($ajaxParameters)."}).done(function( data, textStatus, jqXHR ) {\n";
-		$retour.=$this->_getOnAjaxDone($responseElement, $jqueryDone,$ajaxTransition,$jsCallback,$hasLoader,($historize?$originalSelector:null))."});\n";
-		$retour=$this->_addJsCondition($jsCondition,$retour);
+		$retour.=$this->_getOnAjaxDone($responseElement, $jqueryDone, $ajaxTransition, $jsCallback, $hasLoader, ($historize ? $originalSelector : null))."});\n";
+		$retour=$this->_addJsCondition($jsCondition, $retour);
 		if ($immediatly)
 			$this->jquery_code_for_compile[]=$retour;
 		return $retour;
 	}
 
-	protected function createAjaxParameters(&$original,$parameters){
-		$validParameters=["dataType"=>"'%value%'","beforeSend"=>"function(jqXHR,settings){%value%}","complete"=>"function(jqXHR){%value%}"];
-		foreach ($validParameters as $param=>$mask){
-			if(isset($parameters[$param])){
+	protected function createAjaxParameters(&$original, $parameters) {
+		$validParameters=["dataType"=>"'%value%'", "beforeSend"=>"function(jqXHR,settings){%value%}", "complete"=>"function(jqXHR){%value%}"];
+		foreach ($validParameters as $param=>$mask) {
+			if (isset($parameters[$param])) {
 				$original[$param]=\str_replace("%value%", $parameters[$param], $mask);
 			}
 		}
 	}
 
-	protected function implodeAjaxParameters($ajaxParameters){
-		$s = ''; foreach ($ajaxParameters as $k=>$v) { if ($s !== '') { $s .= ','; } $s .= "'{$k}':{$v}"; }
+	protected function implodeAjaxParameters($ajaxParameters) {
+		$s=''; foreach ($ajaxParameters as $k=>$v) { if ($s!=='') { $s.=','; } $s.="'{$k}':{$v}"; }
 		return $s;
 	}
 
-	protected function _addJsCondition($jsCondition,$jsSource){
-		if(isset($jsCondition)){
+	protected function _addJsCondition($jsCondition, $jsSource) {
+		if (isset($jsCondition)) {
 			return "if(".$jsCondition."){\n".$jsSource."\n}";
 		}
 		return $jsSource;
 	}
 
 
-	protected function _getAjaxUrl($url,$attr){
+	protected function _getAjaxUrl($url, $attr) {
 		$url=$this->_correctAjaxUrl($url);
 		$retour="url='".$url."';";
 		$slash="/";
-		if(JString::endswith($url, "/")===true){
+		if (JString::endswith($url, "/")===true) {
 			$slash="";
 		}
-		if(JString::isNotNull($attr)){
-			if ($attr==="value"){
+		if (JString::isNotNull($attr)) {
+			if ($attr==="value") {
 				$retour.="url=url+'".$slash."'+$(this).val();\n";
-			}elseif ($attr==="html"){
+			}elseif ($attr==="html") {
 				$retour.="url=url+'".$slash."'+$(this).html();\n";
-			}elseif(\substr($attr, 0,3)==="js:"){
+			}elseif (\substr($attr, 0, 3)==="js:") {
 				$retour.="url=url+'".$slash."'+".\substr($attr, 3).";\n";
-			}elseif($attr!==null && $attr!=="")
+			}elseif ($attr!==null && $attr!=="")
 				$retour.="url=url+'".$slash."'+($(this).attr('".$attr."')||'');\n";
 		}
 		return $retour;
 	}
 	
-	protected function onPopstate(){
+	protected function onPopstate() {
 		return "window.onpopstate = function(e){if(e.state){var target=e.state.jqueryDone;$(e.state.selector)[target](e.state.html);}};";
 	}
 
-	protected function _getOnAjaxDone($responseElement,$jqueryDone,$ajaxTransition,$jsCallback,$hasLoader=false,$history=null){
-		$retour="";$call=null;
+	protected function _getOnAjaxDone($responseElement, $jqueryDone, $ajaxTransition, $jsCallback, $hasLoader=false, $history=null) {
+		$retour=""; $call=null;
 		if (JString::isNotNull($responseElement)) {
-			if(isset($ajaxTransition)){
+			if (isset($ajaxTransition)) {
 				$call=$this->setAjaxDataCall($ajaxTransition);
-			}elseif(isset($this->ajaxTransition)){
+			}elseif (isset($this->ajaxTransition)) {
 				$call=$this->ajaxTransition;
 			}
-			if(\is_callable($call))
-				$retour="\t".$call($responseElement,$jqueryDone).";\n";
+			if (\is_callable($call))
+				$retour="\t".$call($responseElement, $jqueryDone).";\n";
 			else
 				$retour="\t{$responseElement}.{$jqueryDone}( data );\n";
 		}
-		if(isset($history)){
+		if (isset($history)) {
 			$retour.="\nwindow.history.pushState({'html':data,'selector':".Javascript::prep_value($history).",'jqueryDone':'{$jqueryDone}'},'', url);";
 		}
-		if($hasLoader==="internal"){
+		if ($hasLoader==="internal") {
 			$retour.="\n$(self).removeClass('loading');";
 		}
 		$retour.="\t".$jsCallback."\n";
 		return $retour;
 	}
 
-	protected function _getResponseElement($responseElement){
+	protected function _getResponseElement($responseElement) {
 		if (JString::isNotNull($responseElement)) {
 			$responseElement=Javascript::prep_value($responseElement);
 			$responseElement=Javascript::prep_jquery_selector($responseElement);
@@ -134,33 +134,33 @@ 
 	protected function _correctAjaxUrl($url) {
 		if ($url!=="/" && JString::endsWith($url, "/")===true)
 			$url=substr($url, 0, strlen($url)-1);
-			if (strncmp($url, 'http://', 7)!=0&&strncmp($url, 'https://', 8)!=0) {
+			if (strncmp($url, 'http://', 7)!=0 && strncmp($url, 'https://', 8)!=0) {
 				$url=$this->getUrl($url);
 			}
 			return $url;
 	}
 
-	public static function _correctParams($params){
-		if(JString::isNull($params)){
+	public static function _correctParams($params) {
+		if (JString::isNull($params)) {
 			return "";
 		}
-		if(\preg_match("@^\{.*?\}$@", $params)){
+		if (\preg_match("@^\{.*?\}$@", $params)) {
 			return '$.param('.$params.')';
 		}
 		return $params;
 	}
 
-	public static function _implodeParams($parameters){
+	public static function _implodeParams($parameters) {
 		$allParameters=[];
-		foreach ($parameters as $params){
-			if(isset($params))
+		foreach ($parameters as $params) {
+			if (isset($params))
 				$allParameters[]=self::_correctParams($params);
 		}
 		return \implode("+'&'+", $allParameters);
 	}
 
-	protected function addLoading(&$retour, $responseElement,$ajaxLoader=null) {
-		if(!isset($ajaxLoader)){
+	protected function addLoading(&$retour, $responseElement, $ajaxLoader=null) {
+		if (!isset($ajaxLoader)) {
 			$ajaxLoader=$this->ajaxLoader;
 		}
 		$loading_notifier='<div class="ajax-loader">'.$ajaxLoader.'</div>';
@@ -168,19 +168,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;
 		}
 	}
@@ -194,8 +194,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);
 	}
 
 	/**
@@ -204,9 +204,9 @@ 
 	 * @param string $responseElement selector of the HTML element displaying the answer
 	 * @param array $parameters default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null,"historize"=>false)
 	 */
-	public function get($url, $responseElement="",$parameters=[]) {
+	public function get($url, $responseElement="", $parameters=[]) {
 		$parameters["immediatly"]=true;
-		return $this->_get($url,$responseElement,$parameters);
+		return $this->_get($url, $responseElement, $parameters);
 	}
 
 	/**
@@ -216,9 +216,9 @@ 
 	 * @param string $responseElement selector of the HTML element displaying the answer
 	 * @param array $parameters default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null,"historize"=>false)
 	 */
-	public function ajax($method,$url, $responseElement="", $parameters=[]) {
+	public function ajax($method, $url, $responseElement="", $parameters=[]) {
 		$parameters["immediatly"]=true;
-		return $this->_ajax($method,$url,$responseElement,$parameters);
+		return $this->_ajax($method, $url, $responseElement, $parameters);
 	}
 
 	/**
@@ -228,9 +228,9 @@ 
 	 * @param string $responseElement selector of the HTML element displaying the answer
 	 * @param array $parameters default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null,"historize"=>false)
 	 */
-	public function ajaxDeferred($method,$url, $responseElement="", $parameters=[]) {
+	public function ajaxDeferred($method, $url, $responseElement="", $parameters=[]) {
 		$parameters["immediatly"]=false;
-		return $this->_ajax($method,$url,$responseElement,$parameters);
+		return $this->_ajax($method, $url, $responseElement, $parameters);
 	}
 
 	/**
@@ -239,15 +239,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);
 	}
 
 	/**
@@ -257,7 +257,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);
 	}
 
 	/**
@@ -268,9 +268,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"]);
 	}
 
 	/**
@@ -281,7 +281,7 @@ 
 	 */
 	public function jsonDeferred($url, $method="get", $parameters=[]) {
 		$parameters["immediatly"]=false;
-		return $this->_json($url,$method,$parameters);
+		return $this->_json($url, $method, $parameters);
 	}
 
 	/**
@@ -292,26 +292,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);
 	}
 
 	/**
@@ -322,7 +322,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);
 	}
 
 	/**
@@ -345,9 +345,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"]);
 	}
 
 	/**
@@ -359,7 +359,7 @@ 
 	 */
 	public function getDeferred($url, $responseElement="", $parameters=[]) {
 		$parameters["immediatly"]=false;
-		return $this->_get($url, $responseElement,$parameters);
+		return $this->_get($url, $responseElement, $parameters);
 	}
 
 	/**
@@ -372,8 +372,8 @@ 
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>null,"headers"=>null,"historize"=>false)
 	 */
 	public function getOn($event, $element, $url, $responseElement="", $parameters=array()) {
-		$this->setDefaultParameters($parameters, ["preventDefault"=>true,"stopPropagation"=>true,"immediatly"=>true]);
-		return $this->_add_event($element, $this->getDeferred($url,$responseElement,$parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"],$parameters["immediatly"]);
+		$this->setDefaultParameters($parameters, ["preventDefault"=>true, "stopPropagation"=>true, "immediatly"=>true]);
+		return $this->_add_event($element, $this->getDeferred($url, $responseElement, $parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"], $parameters["immediatly"]);
 	}
 
 	/**
@@ -386,8 +386,8 @@ 
 	 * @param array $parameters default : array("method"=>"get","preventDefault"=>true,"stopPropagation"=>true,"params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","jsCondition"=>NULL,"headers"=>null,"historize"=>false)
 	 */
 	public function ajaxOn($event, $element, $url, $responseElement="", $parameters=array()) {
-		$this->setDefaultParameters($parameters, ["preventDefault"=>true,"stopPropagation"=>true,"immediatly"=>true,"method"=>"get"]);
-		return $this->_add_event($element, $this->ajaxDeferred($parameters["method"],$url,$responseElement,$parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"],$parameters["immediatly"]);
+		$this->setDefaultParameters($parameters, ["preventDefault"=>true, "stopPropagation"=>true, "immediatly"=>true, "method"=>"get"]);
+		return $this->_add_event($element, $this->ajaxDeferred($parameters["method"], $url, $responseElement, $parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"], $parameters["immediatly"]);
 	}
 
 	/**
@@ -421,15 +421,15 @@ 
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"params"=>"{}","jsCallback"=>NULL,"attr"=>"href","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","jsCondition"=>NULL,"headers"=>null,"historize"=>true)
 	 * @return $this
 	 */
-	public function getHref($element,$responseElement="",$parameters=array()){
+	public function getHref($element, $responseElement="", $parameters=array()) {
 		$parameters["attr"]="href";
-		if(JString::isNull($responseElement)){
+		if (JString::isNull($responseElement)) {
 			$responseElement='$($(this).attr("data-target"))';
 		}
-		if(!isset($parameters["historize"])){
+		if (!isset($parameters["historize"])) {
 			$parameters["historize"]=true;
 		}
-		return $this->getOnClick($element, "",$responseElement,$parameters);
+		return $this->getOnClick($element, "", $responseElement, $parameters);
 	}
 	
 	/**
@@ -439,20 +439,20 @@ 
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"params"=>"{}","jsCallback"=>NULL,"attr"=>"href","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","jsCondition"=>NULL,"headers"=>null,"historize"=>false)
 	 * @return $this
 	 */
-	public function postHref($element,$responseElement="",$parameters=array()){
+	public function postHref($element, $responseElement="", $parameters=array()) {
 		$parameters["attr"]="href";
-		if(JString::isNull($responseElement)){
+		if (JString::isNull($responseElement)) {
 			$responseElement='$($(this).attr("data-target"))';
 		}
-		if(!isset($parameters["historize"])){
+		if (!isset($parameters["historize"])) {
 			$parameters["historize"]=true;
 		}
-		return $this->postOnClick($element, "","{}",$responseElement,$parameters);
+		return $this->postOnClick($element, "", "{}", $responseElement, $parameters);
 	}
 
-	private function _post($url, $params="{}",$responseElement="", $parameters=[]) {
+	private function _post($url, $params="{}", $responseElement="", $parameters=[]) {
 		$parameters["params"]=$params;
-		return $this->_ajax("POST", $url,$responseElement,$parameters);
+		return $this->_ajax("POST", $url, $responseElement, $parameters);
 	}
 
 	/**
@@ -462,8 +462,8 @@ 
 	 * @param string $params JSON parameters
 	 * @param array $parameters default : array("jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null,"historize"=>false)
 	 */
-	public function post($url, $params="{}",$responseElement="", $parameters=[]) {
-		return $this->_post($url, $params,$responseElement, $parameters);
+	public function post($url, $params="{}", $responseElement="", $parameters=[]) {
+		return $this->_post($url, $params, $responseElement, $parameters);
 	}
 
 	/**
@@ -474,7 +474,7 @@ 
 	 * @param string $responseElement selector of the HTML element displaying the answer
 	 * @param array $parameters default : array("jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null,"historize"=>false)
 	 */
-	public function postDeferred($url, $params="{}",$responseElement="", $parameters=[]) {
+	public function postDeferred($url, $params="{}", $responseElement="", $parameters=[]) {
 		$parameters["immediatly"]=false;
 		return $this->_post($url, $params, $responseElement, $parameters);
 	}
@@ -490,8 +490,8 @@ 
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null,"historize"=>false)
 	 */
 	public function postOn($event, $element, $url, $params="{}", $responseElement="", $parameters=array()) {
-		$this->setDefaultParameters($parameters, ["preventDefault"=>true,"stopPropagation"=>true,"immediatly"=>true]);
-		return $this->_add_event($element, $this->postDeferred($url, $params, $responseElement, $parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"],$parameters["immediatly"]);
+		$this->setDefaultParameters($parameters, ["preventDefault"=>true, "stopPropagation"=>true, "immediatly"=>true]);
+		return $this->_add_event($element, $this->postDeferred($url, $params, $responseElement, $parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"], $parameters["immediatly"]);
 	}
 
 	/**
@@ -508,33 +508,33 @@ 
 	}
 
 	private function _postForm($url, $form, $responseElement, $parameters=[]) {
-		if(isset($this->params["ajax"])){
+		if (isset($this->params["ajax"])) {
 			extract($this->params["ajax"]);
 		}
-		$params="{}";$validation=false;
+		$params="{}"; $validation=false;
 		\extract($parameters);
-		$async=($async)?"true":"false";
+		$async=($async) ? "true" : "false";
 		$jsCallback=isset($jsCallback) ? $jsCallback : "";
 		$retour=$this->_getAjaxUrl($url, $attr);
 		$retour.="\n$('#".$form."').trigger('ajaxSubmit');";
 		$retour.="\nvar params=$('#".$form."').serialize();\n";
-		if(isset($params)){
+		if (isset($params)) {
 			$retour.="params+='&'+".self::_correctParams($params).";\n";
 		}
 		$responseElement=$this->_getResponseElement($responseElement);
 		$retour.="var self=this;\n";
-		if($hasLoader===true){
-			$this->addLoading($retour, $responseElement,$ajaxLoader);
-		}elseif($hasLoader==="internal"){
+		if ($hasLoader===true) {
+			$this->addLoading($retour, $responseElement, $ajaxLoader);
+		}elseif ($hasLoader==="internal") {
 			$retour.="\n$(this).addClass('loading');";
 		}
-		$ajaxParameters=["url"=>"url","method"=>"'POST'","data"=>"params","async"=>$async];
-		if(isset($headers)){
+		$ajaxParameters=["url"=>"url", "method"=>"'POST'", "data"=>"params", "async"=>$async];
+		if (isset($headers)) {
 			$ajaxParameters["headers"]=$headers;
 		}
 		$this->createAjaxParameters($ajaxParameters, $parameters);
 		$retour.="$.ajax({".$this->implodeAjaxParameters($ajaxParameters)."}).done(function( data ) {\n";
-		$retour.=$this->_getOnAjaxDone($responseElement, $jqueryDone,$ajaxTransition,$jsCallback,$hasLoader)."});\n";
+		$retour.=$this->_getOnAjaxDone($responseElement, $jqueryDone, $ajaxTransition, $jsCallback, $hasLoader)."});\n";
 
 		if ($validation) {
 			$retour="$('#".$form."').validate({submitHandler: function(form) {
@@ -584,8 +584,8 @@ 
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"validation"=>false,"params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>null,"headers"=>null,"historize"=>false)
 	 */
 	public function postFormOn($event, $element, $url, $form, $responseElement="", $parameters=array()) {
-		$this->setDefaultParameters($parameters, ["preventDefault"=>true,"stopPropagation"=>true,"immediatly"=>true]);
-		return $this->_add_event($element, $this->postFormDeferred($url, $form, $responseElement,$parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"],$parameters["immediatly"]);
+		$this->setDefaultParameters($parameters, ["preventDefault"=>true, "stopPropagation"=>true, "immediatly"=>true]);
+		return $this->_add_event($element, $this->postFormDeferred($url, $form, $responseElement, $parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"], $parameters["immediatly"]);
 	}
 
 	/**