phpMv / phpMv-UI

Ajax/service/Javascript.php

Spacing +4 added lines, -4 removed lines

@@ -6,8 +6,8 @@ 
 	public static $preventDefault="\nif(event && event.preventDefault) event.preventDefault();\n";
 	public static $stopPropagation="\nif(event && event.stopPropagation) event.stopPropagation();\n";
 
-	public static function containsCode($expression){
-		return strrpos($expression, 'this')!==false||strrpos($expression, 'event')!==false||strrpos($expression, 'self')!==false;
+	public static function containsCode($expression) {
+		return strrpos($expression, 'this')!==false || strrpos($expression, 'event')!==false || strrpos($expression, 'self')!==false;
 	}
 
 	/**
@@ -43,8 +43,8 @@ 
 		return $value;
 	}
 
-	public static function prep_jquery_selector($value){
-		if(JString::startswith($value, '$(')===false){
+	public static function prep_jquery_selector($value) {
+		if (JString::startswith($value, '$(')===false) {
 			return '$('.$value.')';
 		}
 		return $value;

Ajax/service/AjaxTransition.php

Spacing +8 added lines, -8 removed lines

@@ -3,26 +3,26 @@
 use Ajax\semantic\html\base\constants\Transition;
 
 class AjaxTransition {
-	public static function none($responseElement,$jqueryDone="html"){
+	public static function none($responseElement, $jqueryDone="html") {
 		return $responseElement.".".$jqueryDone."( data )";
 	}
 
-	public static function jqFade($responseElement,$jqueryDone="html"){
+	public static function jqFade($responseElement, $jqueryDone="html") {
 		return $responseElement.".hide().{$jqueryDone}( data ).fadeIn()";
 	}
 
-	public static function jqSlide($responseElement,$jqueryDone="html"){
+	public static function jqSlide($responseElement, $jqueryDone="html") {
 		return $responseElement.".hide().{$jqueryDone}( data ).slideDown()";
 	}
 
-	public static function random($responseElement,$jqueryDone="html"){
+	public static function random($responseElement, $jqueryDone="html") {
 		$transitions=Transition::getConstantValues();
-		$transition=$transitions[\rand(0,\sizeof($transitions)-1)];
-		return self::__callStatic($transition, [$responseElement,$jqueryDone]);
+		$transition=$transitions[\rand(0, \sizeof($transitions)-1)];
+		return self::__callStatic($transition, [$responseElement, $jqueryDone]);
 	}
 
-	public static function __callStatic($name, $arguments){
-		if(\sizeof($arguments)==2){
+	public static function __callStatic($name, $arguments) {
+		if (\sizeof($arguments)==2) {
 			$responseElement=$arguments[0];
 			$jqueryDone=$arguments[1];
 			$name=JString::camelCaseToSeparated($name);

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;
 	}

Braces +22 added lines, -15 removed lines

@@ -52,8 +52,9 @@ 
 	 */
 	public function addHeader($title, $niveau=1, $dividing=true) {
 		$header=new HtmlHeader("", $niveau, $title);
-		if ($dividing)
-			$header->setDividing();
+		if ($dividing) {
+					$header->setDividing();
+		}
 		return $this->addItem($header);
 	}
 
@@ -81,8 +82,9 @@ 
 					if (\is_string($end)) {
 						$label=$end;
 						\array_pop($fields);
-					} else
-						$label=NULL;
+					} else {
+											$label=NULL;
+					}
 				}
 				$this->_fields=\array_merge($this->_fields, $fields);
 				$fields=new HtmlFormFields("fields-" . $this->identifier . "-" . $this->count(), $fields);
@@ -146,27 +148,31 @@ 
 	 */
 	public function addMessage($identifier, $content, $header=NULL, $icon=NULL, $type=NULL) {
 		$message=new HtmlMessage($identifier, $content);
-		if (isset($header))
-			$message->addHeader($header);
-		if (isset($icon))
-			$message->setIcon($icon);
-		if (isset($type))
-			$message->setStyle($type);
+		if (isset($header)) {
+					$message->addHeader($header);
+		}
+		if (isset($icon)) {
+					$message->setIcon($icon);
+		}
+		if (isset($type)) {
+					$message->setStyle($type);
+		}
 		return $this->addItem($message);
 	}
 
 
 
 	public function compile(JsUtils $js=NULL,&$view=NULL){
-		if(\sizeof($this->_validationParams)>0)
-			$this->setProperty("novalidate", "");
+		if(\sizeof($this->_validationParams)>0) {
+					$this->setProperty("novalidate", "");
+		}
 		return parent::compile($js,$view);
 	}
 
 	public function run(JsUtils $js) {
 		if(isset($js)){
 			$compo=$js->semantic()->form("#".$this->identifier);
-		}else{
+		} else{
 			$compo=new Form();
 			$compo->attach("#".$this->identifier);
 		}
@@ -179,8 +185,9 @@ 
 			if($field instanceof HtmlFormFields){
 				$items=$field->getItems();
 				foreach ($items as $_field){
-					if($_field instanceof HtmlFormField)
-						$compo=$this->addCompoValidation($compo, $_field);
+					if($_field instanceof HtmlFormField) {
+											$compo=$this->addCompoValidation($compo, $_field);
+					}
 				}
 			}
 		}

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) {

Braces +6 added lines, -5 removed lines

@@ -49,15 +49,16 @@
 	 * @return Rule
 	 */
 	public function addRule($type,$prompt=NULL,$value=NULL){
-		if($type instanceof  Rule)
-			$rule=$type;
-		else if(\is_array($type)){
+		if($type instanceof  Rule) {
+					$rule=$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);
+		} else {
+					$rule=new Rule($type,$prompt,$value);
+		}
 		$this->rules[]=$rule;
 		return $rule;
 	}

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/traits/JsUtilsAjaxTrait.php

Spacing +94 added lines, -94 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,78 +35,78 @@ 
 		$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);
 		}
-		$async=($async)?"true":"false";
-		$ajaxParameters=["url"=>"url","method"=>"'".\strtoupper($method)."'","async"=>$async];
-		if(isset($params)){
+		$async=($async) ? "true" : "false";
+		$ajaxParameters=["url"=>"url", "method"=>"'".\strtoupper($method)."'", "async"=>$async];
+		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";
 		}
@@ -114,7 +114,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);
@@ -125,26 +125,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);
@@ -162,19 +162,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;
 		}
 	}
@@ -188,8 +188,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);
 	}
 
 	/**
@@ -198,9 +198,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);
 	}
 
 	/**
@@ -210,9 +210,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);
 	}
 
 	/**
@@ -222,9 +222,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);
 	}
 
 	/**
@@ -237,7 +237,7 @@ 
 	 * @param string $context
 	 * @param boolean $immediatly
 	 */
-	private function _json($url, $method="get", $params="{}", $jsCallback=NULL, $attr="id", $context="document",$immediatly=false) {
+	private function _json($url, $method="get", $params="{}", $jsCallback=NULL, $attr="id", $context="document", $immediatly=false) {
 		$jsCallback=isset($jsCallback) ? $jsCallback : "";
 		$retour=$this->_getAjaxUrl($url, $attr);
 		$retour.="$.{$method}(url,".$params.").done(function( data ) {\n";
@@ -260,8 +260,8 @@ 
 	 * @param string $context
 	 * @param boolean $immediatly
 	 */
-	public function json($url, $method="get", $params="{}", $jsCallback=NULL,$context="document",$immediatly=false) {
-		return $this->_json($url,$method,$params,$jsCallback,NULL,$context,$immediatly);
+	public function json($url, $method="get", $params="{}", $jsCallback=NULL, $context="document", $immediatly=false) {
+		return $this->_json($url, $method, $params, $jsCallback, NULL, $context, $immediatly);
 	}
 
 	/**
@@ -271,7 +271,7 @@ 
 	 * @param string $url the request address
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","params"=>"{}","method"=>"get","immediatly"=>true)
 	 */
-	public function jsonOn($event,$element, $url,$parameters=array()) {
+	public function jsonOn($event, $element, $url, $parameters=array()) {
 		$preventDefault=true;
 		$stopPropagation=true;
 		$jsCallback=null;
@@ -281,7 +281,7 @@ 
 		$params="{}";
 		$immediatly=true;
 		extract($parameters);
-		return $this->_add_event($element, $this->_json($url,$method, $params,$jsCallback, $attr,$context), $event, $preventDefault, $stopPropagation,$immediatly);
+		return $this->_add_event($element, $this->_json($url, $method, $params, $jsCallback, $attr, $context), $event, $preventDefault, $stopPropagation, $immediatly);
 	}
 
 	/**
@@ -292,8 +292,8 @@ 
 	 * @param string $jsCallback javascript code to execute after the request
 	 * @param string $context jquery DOM element, array container.
 	 */
-	public function jsonDeferred($url, $method="get", $params="{}", $jsCallback=NULL,$context=NULL) {
-		return $this->json($url, $method, $params, $jsCallback, $context,false);
+	public function jsonDeferred($url, $method="get", $params="{}", $jsCallback=NULL, $context=NULL) {
+		return $this->json($url, $method, $params, $jsCallback, $context, false);
 	}
 
 	/**
@@ -306,22 +306,22 @@ 
 	 * @param string $rowClass the css class for the new element
 	 * @param boolean $immediatly
 	 */
-	private function _jsonArray($maskSelector, $url, $method="get", $params="{}", $jsCallback=NULL,$rowClass="_json",$context=NULL,$attr="id",$immediatly=false) {
+	private function _jsonArray($maskSelector, $url, $method="get", $params="{}", $jsCallback=NULL, $rowClass="_json", $context=NULL, $attr="id", $immediatly=false) {
 		$jsCallback=isset($jsCallback) ? $jsCallback : "";
 		$retour=$this->_getAjaxUrl($url, $attr);
-		if($context===null){
+		if ($context===null) {
 			$parent="$('".$maskSelector."').parent()";
-			$newElm = "$('#'+newId)";
-		}else{
+			$newElm="$('#'+newId)";
+		} else {
 			$parent=$context;
-			$newElm = $context.".find('#'+newId)";
+			$newElm=$context.".find('#'+newId)";
 		}
 		$appendTo="\t\tnewElm.appendTo(".$parent.");\n";
 		$retour.="var self = $(this);\n$.{$method}(url,".$params.").done(function( data ) {\n";
 		$retour.=$parent.".find('._json').remove();";
 		$retour.="\tdata=$.parseJSON(data);$.each(data, function(index, value) {\n"."\tvar created=false;var maskElm=$('".$maskSelector."').first();maskElm.hide();"."\tvar newId=(maskElm.attr('id') || 'mask')+'-'+index;"."\tvar newElm=".$newElm.";\n"."\tif(!newElm.length){\n"."\t\tnewElm=maskElm.clone();
 		newElm.attr('id',newId);\n;newElm.addClass('{$rowClass}').removeClass('_jsonArrayModel');\nnewElm.find('[id]').each(function(){ var newId=$(this).attr('id')+'-'+index;$(this).attr('id',newId).removeClass('_jsonArrayChecked');});\n";
-		$retour.= $appendTo;
+		$retour.=$appendTo;
 		$retour.="\t}\n"."\tfor(var key in value){\n"."\t\t\tvar html = $('<div />').append($(newElm).clone()).html();\n"."\t\t\tif(html.indexOf('__'+key+'__')>-1){\n"."\t\t\t\tcontent=$(html.split('__'+key+'__').join(value[key]));\n"."\t\t\t\t$(newElm).replaceWith(content);newElm=content;\n"."\t\t\t}\n"."\t\tvar sel='[data-id=\"'+key+'\"]';if($(sel,newElm).length){\n"."\t\t\tvar selElm=$(sel,newElm);\n"."\t\t\t if(selElm.is('[value]')) { selElm.attr('value',value[key]);selElm.val(value[key]);} else { selElm.html(value[key]); }\n"."\t\t}\n"."}\n"."\t$(newElm).show(true);"."\n"."\t$(newElm).removeClass('hide');"."});\n";
 		$retour.="\t$(document).trigger('jsonReady',[data]);\n";
 		$retour.="\t".$jsCallback."\n"."});\n";
@@ -340,8 +340,8 @@ 
 	 * @param string $context jquery DOM element, array container.
 	 * @param boolean $immediatly
 	 */
-	public function jsonArray($maskSelector, $url, $method="get", $params="{}", $jsCallback=NULL,$rowClass="_json",$context=NULL,$immediatly=false) {
-		return $this->_jsonArray($maskSelector, $url,$method,$params,$jsCallback,$rowClass,$context,NULL,$immediatly);
+	public function jsonArray($maskSelector, $url, $method="get", $params="{}", $jsCallback=NULL, $rowClass="_json", $context=NULL, $immediatly=false) {
+		return $this->_jsonArray($maskSelector, $url, $method, $params, $jsCallback, $rowClass, $context, NULL, $immediatly);
 	}
 
 	/**
@@ -354,8 +354,8 @@ 
 	 * @param string $rowClass the css class for the new element
 	 * @param string $context jquery DOM element, array container.
 	 */
-	public function jsonArrayDeferred($maskSelector, $url, $method="get", $params="{}", $jsCallback=NULL,$rowClass="_json",$context=NULL) {
-		return $this->jsonArray($maskSelector, $url, $method, $params, $jsCallback,$rowClass,$context,false);
+	public function jsonArrayDeferred($maskSelector, $url, $method="get", $params="{}", $jsCallback=NULL, $rowClass="_json", $context=NULL) {
+		return $this->jsonArray($maskSelector, $url, $method, $params, $jsCallback, $rowClass, $context, false);
 	}
 
 	/**
@@ -365,18 +365,18 @@ 
 	 * @param string $url the request url
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","params"=>"{}","method"=>"get","rowClass"=>"_json","immediatly"=>true)
 	 */
-	public function jsonArrayOn($event,$element,$maskSelector, $url,$parameters=array()) {
+	public function jsonArrayOn($event, $element, $maskSelector, $url, $parameters=array()) {
 		$preventDefault=true;
 		$stopPropagation=true;
 		$jsCallback=null;
 		$attr="id";
 		$method="get";
-		$context = null;
+		$context=null;
 		$params="{}";
 		$immediatly=true;
 		$rowClass="_json";
 		extract($parameters);
-		return $this->_add_event($element, $this->_jsonArray($maskSelector,$url,$method, $params,$jsCallback, $rowClass, $context,$attr), $event, $preventDefault, $stopPropagation,$immediatly);
+		return $this->_add_event($element, $this->_jsonArray($maskSelector, $url, $method, $params, $jsCallback, $rowClass, $context, $attr), $event, $preventDefault, $stopPropagation, $immediatly);
 	}
 
 	/**
@@ -388,7 +388,7 @@ 
 	 */
 	public function getDeferred($url, $responseElement="", $parameters=[]) {
 		$parameters["immediatly"]=false;
-		return $this->_get($url, $responseElement,$parameters);
+		return $this->_get($url, $responseElement, $parameters);
 	}
 
 	/**
@@ -401,8 +401,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"]);
 	}
 
 	/**
@@ -415,8 +415,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"]);
 	}
 
 	/**
@@ -443,9 +443,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);
 	}
 
 	/**
@@ -455,8 +455,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);
 	}
 
 	/**
@@ -467,7 +467,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);
 	}
@@ -483,8 +483,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"]);
 	}
 
 	/**
@@ -501,27 +501,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) {
@@ -571,8 +571,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"]);
 	}
 
 	/**

Braces +33 added lines, -24 removed lines

@@ -50,8 +50,9 @@ 
 		$retour.="$.ajax({".$this->implodeAjaxParameters($ajaxParameters)."}).done(function( data, textStatus, jqXHR ) {\n";
 		$retour.=$this->_getOnAjaxDone($responseElement, $jqueryDone,$ajaxTransition,$jsCallback)."});\n";
 		$retour=$this->_addJsCondition($jsCondition,$retour);
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$retour;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$retour;
+		}
 		return $retour;
 	}
 
@@ -87,12 +88,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;
 	}
@@ -102,13 +104,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";
+			}
 		}
 		$retour.="\t".$jsCallback."\n";
 		return $retour;
@@ -123,8 +126,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);
 			}
@@ -144,8 +148,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);
 	}
@@ -174,8 +179,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;
+			}
 		}
 	}
 
@@ -246,8 +252,9 @@ 
 				$retour.="\t".$jsCallback."\n".
 						"\t$(document).trigger('jsonReady',[data]);\n".
 						"});\n";
-				if ($immediatly)
-					$this->jquery_code_for_compile[]=$retour;
+				if ($immediatly) {
+									$this->jquery_code_for_compile[]=$retour;
+				}
 		return $retour;
 	}
 
@@ -312,7 +319,7 @@ 
 		if($context===null){
 			$parent="$('".$maskSelector."').parent()";
 			$newElm = "$('#'+newId)";
-		}else{
+		} else{
 			$parent=$context;
 			$newElm = $context.".find('#'+newId)";
 		}
@@ -325,8 +332,9 @@ 
 		$retour.="\t}\n"."\tfor(var key in value){\n"."\t\t\tvar html = $('<div />').append($(newElm).clone()).html();\n"."\t\t\tif(html.indexOf('__'+key+'__')>-1){\n"."\t\t\t\tcontent=$(html.split('__'+key+'__').join(value[key]));\n"."\t\t\t\t$(newElm).replaceWith(content);newElm=content;\n"."\t\t\t}\n"."\t\tvar sel='[data-id=\"'+key+'\"]';if($(sel,newElm).length){\n"."\t\t\tvar selElm=$(sel,newElm);\n"."\t\t\t if(selElm.is('[value]')) { selElm.attr('value',value[key]);selElm.val(value[key]);} else { selElm.html(value[key]); }\n"."\t\t}\n"."}\n"."\t$(newElm).show(true);"."\n"."\t$(newElm).removeClass('hide');"."});\n";
 		$retour.="\t$(document).trigger('jsonReady',[data]);\n";
 		$retour.="\t".$jsCallback."\n"."});\n";
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$retour;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$retour;
+		}
 		return $retour;
 	}
 
@@ -530,8 +538,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;
 	}
 

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);
 	}
 
 	/**