jcheron / phalcon-jquery

Ajax/common/traits/JsUtilsActionsTrait.php

Spacing +14 added lines, -14 removed lines

@@ -13,7 +13,7 @@ 
 	 * @return string
 	 */
 	public function addClass($element='this', $class='', $immediatly=false) {
-		return $this->js->_genericCallValue('addClass',$element, $class, $immediatly);
+		return $this->js->_genericCallValue('addClass', $element, $class, $immediatly);
 	}
 
 	/**
@@ -23,8 +23,8 @@ 
 	 * @param boolean $immediatly defers the execution if set to false
 	 * @return string
 	 */
-	public function after($to, $element, $immediatly=false){
-		return $this->js->_genericCallElement('after',$to, $element, $immediatly);
+	public function after($to, $element, $immediatly=false) {
+		return $this->js->_genericCallElement('after', $to, $element, $immediatly);
 	}
 
 	/**
@@ -34,8 +34,8 @@ 
 	 * @param boolean $immediatly defers the execution if set to false
 	 * @return string
 	 */
-	public function before($to, $element, $immediatly=false){
-		return $this->js->_genericCallElement('before',$to, $element, $immediatly);
+	public function before($to, $element, $immediatly=false) {
+		return $this->js->_genericCallElement('before', $to, $element, $immediatly);
 	}
 
 	/**
@@ -55,8 +55,8 @@ 
 	 * @param string $value
 	 * @param boolean $immediatly defers the execution if set to false
 	 */
-	public function val($element='this',$value='',$immediatly=false){
-		return $this->js->_genericCallValue('val',$element,$value,$immediatly);
+	public function val($element='this', $value='', $immediatly=false) {
+		return $this->js->_genericCallValue('val', $element, $value, $immediatly);
 	}
 
 	/**
@@ -66,7 +66,7 @@ 
 	 * @param boolean $immediatly defers the execution if set to false
 	 */
 	public function html($element='this', $value='', $immediatly=false) {
-		return $this->js->_genericCallValue('html',$element, $value, $immediatly);
+		return $this->js->_genericCallValue('html', $element, $value, $immediatly);
 	}
 
 	/**
@@ -91,7 +91,7 @@ 
 	 * @return string
 	 */
 	public function append($to, $element, $immediatly=false) {
-		return $this->js->_genericCallElement('append',$to, $element, $immediatly);
+		return $this->js->_genericCallElement('append', $to, $element, $immediatly);
 	}
 
 	/**
@@ -102,7 +102,7 @@ 
 	 * @return string
 	 */
 	public function prepend($to, $element, $immediatly=false) {
-		return $this->js->_genericCallElement('prepend',$to, $element, $immediatly);
+		return $this->js->_genericCallElement('prepend', $to, $element, $immediatly);
 	}
 
 	/**
@@ -153,7 +153,7 @@ 
 	 * @return string
 	 */
 	public function removeClass($element='this', $class='', $immediatly=false) {
-		return $this->js->_genericCall('removeClass',$element, $class, $immediatly);
+		return $this->js->_genericCall('removeClass', $element, $class, $immediatly);
 	}
 
 	/**
@@ -214,7 +214,7 @@ 
 	 * @return string
 	 */
 	public function toggleClass($element='this', $class='', $immediatly=false) {
-		return $this->js->_genericCallValue('toggleClass',$element, $class, $immediatly);
+		return $this->js->_genericCallValue('toggleClass', $element, $class, $immediatly);
 	}
 
 	/**
@@ -290,7 +290,7 @@ 
 		$preventDefault=false;
 		$immediatly=true;
 		extract($parameters);
-		return $this->js->_doJQueryOn($event, $element, $elementToModify, $jqueryCall, $param, $preventDefault, $stopPropagation, $jsCallback,$immediatly);
+		return $this->js->_doJQueryOn($event, $element, $elementToModify, $jqueryCall, $param, $preventDefault, $stopPropagation, $jsCallback, $immediatly);
 	}
 
 	/**
@@ -317,7 +317,7 @@ 
 		$preventDefault=false;
 		$immediatly=true;
 		extract($parameters);
-		$script=$this->js->_execOn($element, $event, $js, $preventDefault, $stopPropagation,$immediatly);
+		$script=$this->js->_execOn($element, $event, $js, $preventDefault, $stopPropagation, $immediatly);
 		return $script;
 	}
 }
\ No newline at end of file

Ajax/common/traits/JqueryAjaxTrait.php

Braces +24 added lines, -17 removed lines

@@ -35,8 +35,9 @@ 
 		}
 		$retour.="$.".$method."(url,".$params.").done(function( data ) {\n";
 		$retour.=$this->_getOnAjaxDone($responseElement, $jsCallback)."});\n";
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$retour;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$retour;
+		}
 			return $retour;
 	}
 
@@ -44,13 +45,15 @@ 
 		$url=$this->_correctAjaxUrl($url);
 		$retour="url='".$url."';\n";
 		$slash="/";
-		if(PhalconUtils::endsWith($url, "/"))
-			$slash="";
+		if(PhalconUtils::endsWith($url, "/")) {
+					$slash="";
+		}
 			if(JString::isNotNull($attr)){
-				if ($attr=="value")
-					$retour.="url=url+'".$slash."'+$(this).val();\n";
-					else if($attr!=null && $attr!=="")
-						$retour.="url=url+'".$slash."'+($(this).attr('".$attr."')||'');\n";
+				if ($attr=="value") {
+									$retour.="url=url+'".$slash."'+$(this).val();\n";
+				} else if($attr!=null && $attr!=="") {
+											$retour.="url=url+'".$slash."'+($(this).attr('".$attr."')||'');\n";
+					}
 			}
 			return $retour;
 	}
@@ -72,8 +75,9 @@ 
 	}
 
 	protected function _correctAjaxUrl($url) {
-		if (PhalconUtils::endsWith($url, "/"))
-			$url=substr($url, 0, strlen($url)-1);
+		if (PhalconUtils::endsWith($url, "/")) {
+					$url=substr($url, 0, strlen($url)-1);
+		}
 			if (strncmp($url, 'http://', 7)!=0&&strncmp($url, 'https://', 8)!=0) {
 				$url=$this->_di->get("url")->get($url);
 			}
@@ -97,8 +101,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;
 	}
 
@@ -137,7 +142,7 @@ 
 		if($context===null){
 			$appendTo="\t\tnewElm.appendTo($('".$maskSelector."').parent());\n";
 			$newElm = "$('#'+newId)";
-		}else{
+		} else{
 			$appendTo="\t\tnewElm.appendTo(".$context.");\n";
 			$newElm = $context.".find('#'+newId)";
 		}
@@ -147,8 +152,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;
 	}
 	/**
@@ -189,8 +195,9 @@ 
 			}});\n";
 			$retour.="$('#".$form."').submit();\n";
 		}
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$retour;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$retour;
+		}
 			return $retour;
 	}
 

Doc Comments +28 added lines

@@ -9,7 +9,17 @@ 
 	protected $ajaxLoader='<span></span><span></span><span></span><span></span><span></span>';
 
 	public abstract function _prep_value($value);
+
+	/**
+	 * @param string $element
+	 * @param string $js
+	 * @param string $event
+	 */
 	public abstract function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false,$immediatly=true);
+
+	/**
+	 * @param string $retour
+	 */
 	protected function addLoading(&$retour, $responseElement) {
 		$loading_notifier='<div class="ajax-loader">';
 		if ($this->ajaxLoader=='') {
@@ -22,13 +32,23 @@ 
 		$retour.="\t\t$({$responseElement}).prepend('{$loading_notifier}');\n";
 	}
 
+	/**
+	 * @param string $url
+	 */
 	public function _get($url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true,$immediatly=false) {
 		return $this->_ajax("get", $url,$params,$responseElement,$jsCallback,$attr,$hasLoader,$immediatly);
 	}
+
+	/**
+	 * @param string $url
+	 */
 	public function _post($url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true,$immediatly=false) {
 		return $this->_ajax("post", $url,$params,$responseElement,$jsCallback,$attr,$hasLoader,$immediatly);
 	}
 
+	/**
+	 * @param string $method
+	 */
 	protected function _ajax($method,$url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true,$immediatly=false) {
 		if(JString::isNull($params)){$params="{}";}
 		$jsCallback=isset($jsCallback) ? $jsCallback : "";
@@ -45,6 +65,9 @@ 
 			return $retour;
 	}
 
+	/**
+	 * @param string $attr
+	 */
 	protected function _getAjaxUrl($url,$attr){
 		$url=$this->_correctAjaxUrl($url);
 		$retour="url='".$url."';\n";
@@ -176,6 +199,11 @@ 
 		return $this->_add_event($element, $this->_jsonArray($maskSelector,$url,$method, $params,$jsCallback, $attr, $context), $event, $preventDefault, $stopPropagation,$immediatly);
 	}
 
+	/**
+	 * @param string $url
+	 * @param string $form
+	 * @param string $responseElement
+	 */
 	public function _postForm($url, $form, $responseElement, $validation=false, $jsCallback=NULL, $attr="id", $hasLoader=true,$immediatly=false) {
 		$jsCallback=isset($jsCallback) ? $jsCallback : "";
 		$retour=$this->_getAjaxUrl($url, $attr);

Spacing +36 added lines, -36 removed lines

@@ -9,12 +9,12 @@ 
 	protected $ajaxLoader='<span></span><span></span><span></span><span></span><span></span>';
 
 	public abstract function _prep_value($value);
-	public abstract function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false,$immediatly=true);
+	public abstract function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false, $immediatly=true);
 	protected function addLoading(&$retour, $responseElement) {
 		$loading_notifier='<div class="ajax-loader">';
 		if ($this->ajaxLoader=='') {
 			$loading_notifier.="Loading...";
-		} else {
+		}else {
 			$loading_notifier.=$this->ajaxLoader;
 		}
 		$loading_notifier.='</div>';
@@ -22,20 +22,20 @@ 
 		$retour.="\t\t$({$responseElement}).prepend('{$loading_notifier}');\n";
 	}
 
-	public function _get($url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true,$immediatly=false) {
-		return $this->_ajax("get", $url,$params,$responseElement,$jsCallback,$attr,$hasLoader,$immediatly);
+	public function _get($url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true, $immediatly=false) {
+		return $this->_ajax("get", $url, $params, $responseElement, $jsCallback, $attr, $hasLoader, $immediatly);
 	}
-	public function _post($url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true,$immediatly=false) {
-		return $this->_ajax("post", $url,$params,$responseElement,$jsCallback,$attr,$hasLoader,$immediatly);
+	public function _post($url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true, $immediatly=false) {
+		return $this->_ajax("post", $url, $params, $responseElement, $jsCallback, $attr, $hasLoader, $immediatly);
 	}
 
-	protected function _ajax($method,$url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true,$immediatly=false) {
-		if(JString::isNull($params)){$params="{}";}
+	protected function _ajax($method, $url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true, $immediatly=false) {
+		if (JString::isNull($params)) {$params="{}"; }
 		$jsCallback=isset($jsCallback) ? $jsCallback : "";
 		$retour=$this->_getAjaxUrl($url, $attr);
 		$responseElement=$this->_getResponseElement($responseElement);
 		$retour.="var self=this;\n";
-		if($hasLoader===true){
+		if ($hasLoader===true) {
 			$this->addLoading($retour, $responseElement);
 		}
 		$retour.="$.".$method."(url,".$params.").done(function( data ) {\n";
@@ -45,22 +45,22 @@ 
 			return $retour;
 	}
 
-	protected function _getAjaxUrl($url,$attr){
+	protected function _getAjaxUrl($url, $attr) {
 		$url=$this->_correctAjaxUrl($url);
 		$retour="url='".$url."';\n";
 		$slash="/";
-		if(PhalconUtils::endsWith($url, "/"))
+		if (PhalconUtils::endsWith($url, "/"))
 			$slash="";
-			if(JString::isNotNull($attr)){
+			if (JString::isNotNull($attr)) {
 				if ($attr=="value")
 					$retour.="url=url+'".$slash."'+$(this).val();\n";
-					else if($attr!=null && $attr!=="")
+					else if ($attr!=null && $attr!=="")
 						$retour.="url=url+'".$slash."'+($(this).attr('".$attr."')||'');\n";
 			}
 			return $retour;
 	}
 
-	protected function _getOnAjaxDone($responseElement,$jsCallback){
+	protected function _getOnAjaxDone($responseElement, $jsCallback) {
 		$retour="";
 		if ($responseElement!=="") {
 			$retour="\t$({$responseElement}).html( data );\n";
@@ -69,7 +69,7 @@ 
 		return $retour;
 	}
 
-	protected function _getResponseElement($responseElement){
+	protected function _getResponseElement($responseElement) {
 		if ($responseElement!=="") {
 			$responseElement=$this->_prep_value($responseElement);
 		}
@@ -79,7 +79,7 @@ 
 	protected function _correctAjaxUrl($url) {
 		if (PhalconUtils::endsWith($url, "/"))
 			$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->_di->get("url")->get($url);
 			}
 			return $url;
@@ -93,7 +93,7 @@ 
 	 * @param string $jsCallback javascript code to execute after the request
 	 * @param boolean $immediatly
 	 */
-	public function _json($url, $method="get", $params="{}", $jsCallback=NULL, $attr="id", $context="document",$immediatly=false) {
+	public 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";
@@ -114,7 +114,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;
@@ -124,7 +124,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);
 	}
 
 	/**
@@ -136,19 +136,19 @@ 
 	 * @param string $context jquery DOM element, array container.
 	 * @param boolean $immediatly
 	 */
-	public function _jsonArray($maskSelector, $url, $method="get", $params="{}", $jsCallback=NULL, $attr="id", $context=null,$immediatly=false) {
+	public function _jsonArray($maskSelector, $url, $method="get", $params="{}", $jsCallback=NULL, $attr="id", $context=null, $immediatly=false) {
 		$jsCallback=isset($jsCallback) ? $jsCallback : "";
 		$retour=$this->_getAjaxUrl($url, $attr);
-		if($context===null){
+		if ($context===null) {
 			$appendTo="\t\tnewElm.appendTo($('".$maskSelector."').parent());\n";
-			$newElm = "$('#'+newId)";
-		}else{
+			$newElm="$('#'+newId)";
+		}else {
 			$appendTo="\t\tnewElm.appendTo(".$context.");\n";
-			$newElm = $context.".find('#'+newId)";
+			$newElm=$context.".find('#'+newId)";
 		}
 		$retour.="var self = $(this);\n$.{$method}(url,".$params.").done(function( data ) {\n";
 		$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";
-		$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";
@@ -163,26 +163,26 @@ 
 	 * @param string $url the request address
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","params"=>"{}","method"=>"get", "context"=>null)
 	 */
-	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;
 		extract($parameters);
-		return $this->_add_event($element, $this->_jsonArray($maskSelector,$url,$method, $params,$jsCallback, $attr, $context), $event, $preventDefault, $stopPropagation,$immediatly);
+		return $this->_add_event($element, $this->_jsonArray($maskSelector, $url, $method, $params, $jsCallback, $attr, $context), $event, $preventDefault, $stopPropagation, $immediatly);
 	}
 
-	public function _postForm($url, $form, $responseElement, $validation=false, $jsCallback=NULL, $attr="id", $hasLoader=true,$immediatly=false) {
+	public function _postForm($url, $form, $responseElement, $validation=false, $jsCallback=NULL, $attr="id", $hasLoader=true, $immediatly=false) {
 		$jsCallback=isset($jsCallback) ? $jsCallback : "";
 		$retour=$this->_getAjaxUrl($url, $attr);
 		$retour.="\nvar params=$('#".$form."').serialize();\n";
 		$responseElement=$this->_getResponseElement($responseElement);
 		$retour.="var self=this;\n";
-		if($hasLoader===true){
+		if ($hasLoader===true) {
 			$this->addLoading($retour, $responseElement);
 		}
 		$retour.="$.post(url,params).done(function( data ) {\n";
@@ -209,7 +209,7 @@ 
 	 * @param string $responseElement
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true)
 	 */
-	public function _getOn($event,$element, $url, $params="{}", $responseElement="", $parameters=array()) {
+	public function _getOn($event, $element, $url, $params="{}", $responseElement="", $parameters=array()) {
 		$preventDefault=true;
 		$stopPropagation=true;
 		$jsCallback=null;
@@ -217,7 +217,7 @@ 
 		$hasLoader=true;
 		$immediatly=true;
 		extract($parameters);
-		return $this->_add_event($element, $this->_get($url, $params, $responseElement, $jsCallback, $attr,$hasLoader), $event, $preventDefault, $stopPropagation,$immediatly);
+		return $this->_add_event($element, $this->_get($url, $params, $responseElement, $jsCallback, $attr, $hasLoader), $event, $preventDefault, $stopPropagation, $immediatly);
 	}
 
 	/**
@@ -230,7 +230,7 @@ 
 	 * @param string $responseElement
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true)
 	 */
-	public function _postOn($event,$element, $url, $params="{}", $responseElement="", $parameters=array()) {
+	public function _postOn($event, $element, $url, $params="{}", $responseElement="", $parameters=array()) {
 		$preventDefault=true;
 		$stopPropagation=true;
 		$jsCallback=null;
@@ -238,7 +238,7 @@ 
 		$hasLoader=true;
 		$immediatly=true;
 		extract($parameters);
-		return $this->_add_event($element, $this->_post($url, $params, $responseElement, $jsCallback, $attr,$hasLoader), $event, $preventDefault, $stopPropagation,$immediatly);
+		return $this->_add_event($element, $this->_post($url, $params, $responseElement, $jsCallback, $attr, $hasLoader), $event, $preventDefault, $stopPropagation, $immediatly);
 	}
 
 	/**
@@ -251,7 +251,7 @@ 
 	 * @param string $responseElement
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"validation"=>false,"jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"immediatly"=>true)
 	 */
-	public function _postFormOn($event,$element, $url, $form, $responseElement="", $parameters=array()) {
+	public function _postFormOn($event, $element, $url, $form, $responseElement="", $parameters=array()) {
 		$preventDefault=true;
 		$stopPropagation=true;
 		$validation=false;
@@ -260,6 +260,6 @@ 
 		$hasLoader=true;
 		$immediatly=true;
 		extract($parameters);
-		return $this->_add_event($element, $this->_postForm($url, $form, $responseElement, $validation, $jsCallback, $attr,$hasLoader), $event, $preventDefault, $stopPropagation,$immediatly);
+		return $this->_add_event($element, $this->_postForm($url, $form, $responseElement, $validation, $jsCallback, $attr, $hasLoader), $event, $preventDefault, $stopPropagation, $immediatly);
 	}
 }
\ No newline at end of file

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

Spacing +33 added lines, -33 removed lines

@@ -13,62 +13,62 @@ 
  * @author jc
  * @version 1.001
  */
-class HtmlForm extends HtmlSemCollection{
+class HtmlForm extends HtmlSemCollection {
 
 	use FieldsTrait;
 
 	protected $_fields;
 
-	public function __construct( $identifier, $elements=array()){
-		parent::__construct( $identifier, "form", "ui form");
-		$this->_states=[State::ERROR,State::SUCCESS,State::WARNING,State::DISABLED];
+	public function __construct($identifier, $elements=array()) {
+		parent::__construct($identifier, "form", "ui form");
+		$this->_states=[State::ERROR, State::SUCCESS, State::WARNING, State::DISABLED];
 		$this->setProperty("name", $this->identifier);
 		$this->_fields=array();
 		$this->addItems($elements);
 	}
 
-	public function addHeader($title,$niveau=1,$dividing=true){
-		$header=new HtmlHeader("",$niveau,$title);
-		if($dividing)
+	public function addHeader($title, $niveau=1, $dividing=true) {
+		$header=new HtmlHeader("", $niveau, $title);
+		if ($dividing)
 			$header->setDividing();
 		return $this->addItem($header);
 	}
 
-	public function addFields($fields=NULL,$label=NULL){
-		if(isset($fields)){
-			if(!$fields instanceof HtmlFormFields){
-				if(\is_array($fields)===false){
-					$fields = \func_get_args();
+	public function addFields($fields=NULL, $label=NULL) {
+		if (isset($fields)) {
+			if (!$fields instanceof HtmlFormFields) {
+				if (\is_array($fields)===false) {
+					$fields=\func_get_args();
 					$end=\end($fields);
-					if(\is_string($end)){
+					if (\is_string($end)) {
 						$label=$end;
 						\array_pop($fields);
 					}else $label=NULL;
 				}
-				$this->_fields=\array_merge($this->_fields,$fields);
-				$fields=new HtmlFormFields("fields-".$this->identifier."-".$this->count(),$fields);
+				$this->_fields=\array_merge($this->_fields, $fields);
+				$fields=new HtmlFormFields("fields-".$this->identifier."-".$this->count(), $fields);
 			}
-			if(isset($label))
-			 $fields=new HtmlFormField("", $fields,$label);
-		}else{
+			if (isset($label))
+			 $fields=new HtmlFormField("", $fields, $label);
+		}else {
 			$fields=new HtmlFormFields("fields-".$this->identifier."-".$this->count());
 		}
 		$this->addItem($fields);
 		return $fields;
 	}
 
-	public function addItem($item){
+	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;
 	}
 
-	public function getField($index){
-		if(\is_string($index)){
+	public function getField($index) {
+		if (\is_string($index)) {
 			$field=$this->getElementById($index, $this->_fields);
-		}else{
+		}else {
 			$field=$this->_fields[$index];
 		}
 		return $field;
@@ -78,7 +78,7 @@ 
 	 * automatically divide fields to be equal width
 	 * @return \Ajax\semantic\html\collections\form\HtmlForm
 	 */
-	public function setEqualWidth(){
+	public function setEqualWidth() {
 		return $this->addToProperty("class", "equal width");
 	}
 
@@ -87,7 +87,7 @@ 
 	 * @param HtmlFormField $field
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
-	public function addField($field){
+	public function addField($field) {
 		return $this->addItem($field);
 	}
 
@@ -99,22 +99,22 @@ 
 	 * @param string $type
 	 * @return \Ajax\semantic\html\collections\HtmlMessage
 	 */
-	public function addMessage($identifier,$content,$header=NULL,$icon=NULL,$type=NULL){
-		$message=new HtmlMessage($identifier,$content);
-		if(isset($header))
+	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))
+		if (isset($icon))
 			$message->setIcon($icon);
-		if(isset($type))
+		if (isset($type))
 			$message->setStyle($type);
 		return $this->addItem($message);
 	}
 
-	public function setLoading(){
+	public function setLoading() {
 		return $this->addToProperty("class", "loading");
 	}
 
-	public function jsState($state){
-		return $this->jsDoJquery("addClass",$state);
+	public function jsState($state) {
+		return $this->jsDoJquery("addClass", $state);
 	}
 }
\ No newline at end of file

Braces +20 added lines, -13 removed lines

@@ -29,8 +29,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);
 	}
 
@@ -43,14 +44,17 @@ 
 					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);
 			}
-			if(isset($label))
-			 $fields=new HtmlFormField("", $fields,$label);
-		}else{
+			if(isset($label)) {
+						 $fields=new HtmlFormField("", $fields,$label);
+			}
+		} else{
 			$fields=new HtmlFormFields("fields-".$this->identifier."-".$this->count());
 		}
 		$this->addItem($fields);
@@ -68,7 +72,7 @@ 
 	public function getField($index){
 		if(\is_string($index)){
 			$field=$this->getElementById($index, $this->_fields);
-		}else{
+		} else{
 			$field=$this->_fields[$index];
 		}
 		return $field;
@@ -101,12 +105,15 @@ 
 	 */
 	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);
 	}
 

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

Braces +3 added lines, -2 removed lines

@@ -13,8 +13,9 @@
 		if(\is_array($value)){
 			$itemO=new HtmlFormInput(JArray::getDefaultValue($value, "id",""),JArray::getDefaultValue($value, "label",null),JArray::getDefaultValue($value, "type", "text"),JArray::getDefaultValue($value, "value",""),JArray::getDefaultValue($value, "placeholder",JArray::getDefaultValue($value, "label",null)));
 			return $itemO;
-		}else
-			return new HtmlFormInput($value);
+		} else {
+					return new HtmlFormInput($value);
+		}
 	}
 
 	public function addInputs($inputs,$fieldslabel=null){

Spacing +18 added lines, -18 removed lines

@@ -9,26 +9,26 @@ 
 use Ajax\semantic\html\collections\form\HtmlFormCheckbox;
 use Ajax\semantic\html\collections\form\HtmlFormRadio;
 trait FieldsTrait {
-	public abstract function addFields($fields=NULL,$label=NULL);
+	public abstract function addFields($fields=NULL, $label=NULL);
 	public abstract function addItem($item);
 
-	protected function createItem($value){
-		if(\is_array($value)){
-			$itemO=new HtmlFormInput(JArray::getDefaultValue($value, "id",""),JArray::getDefaultValue($value, "label",null),JArray::getDefaultValue($value, "type", "text"),JArray::getDefaultValue($value, "value",""),JArray::getDefaultValue($value, "placeholder",JArray::getDefaultValue($value, "label",null)));
+	protected function createItem($value) {
+		if (\is_array($value)) {
+			$itemO=new HtmlFormInput(JArray::getDefaultValue($value, "id", ""), JArray::getDefaultValue($value, "label", null), JArray::getDefaultValue($value, "type", "text"), JArray::getDefaultValue($value, "value", ""), JArray::getDefaultValue($value, "placeholder", JArray::getDefaultValue($value, "label", null)));
 			return $itemO;
 		}else
 			return new HtmlFormInput($value);
 	}
 
-	public function addInputs($inputs,$fieldslabel=null){
+	public function addInputs($inputs, $fieldslabel=null) {
 		$fields=array();
-		foreach ($inputs as $input){
+		foreach ($inputs as $input) {
 			\extract($input);
-			$f=new HtmlFormInput("","");
+			$f=new HtmlFormInput("", "");
 			$f->fromArray($input);
 			$fields[]=$f;
 		}
-		return $this->addFields($fields,$fieldslabel);
+		return $this->addFields($fields, $fieldslabel);
 	}
 
 	/**
@@ -39,23 +39,23 @@ 
 	 * @param boolean $multiple
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
-	public function addDropdown($identifier,$items=array(), $label=NULL,$value=NULL,$multiple=false){
-		return $this->addItem(new HtmlFormDropdown($identifier,$items,$label,$value,$multiple));
+	public function addDropdown($identifier, $items=array(), $label=NULL, $value=NULL, $multiple=false) {
+		return $this->addItem(new HtmlFormDropdown($identifier, $items, $label, $value, $multiple));
 	}
 
-	public function addInput($identifier, $label=NULL,$type="text",$value=NULL,$placeholder=NULL){
-		return $this->addItem(new HtmlFormInput($identifier,$label,$type,$value,$placeholder));
+	public function addInput($identifier, $label=NULL, $type="text", $value=NULL, $placeholder=NULL) {
+		return $this->addItem(new HtmlFormInput($identifier, $label, $type, $value, $placeholder));
 	}
 
-	public function addButton($identifier,$value,$cssStyle=NULL,$onClick=NULL){
-		return $this->addItem(new HtmlButton($identifier,$value,$cssStyle,$onClick));
+	public function addButton($identifier, $value, $cssStyle=NULL, $onClick=NULL) {
+		return $this->addItem(new HtmlButton($identifier, $value, $cssStyle, $onClick));
 	}
 
-	public function addCheckbox($identifier, $label=NULL,$value=NULL,$type=NULL){
-		return $this->addItem(new HtmlFormCheckbox($identifier,$label,$value,$type));
+	public function addCheckbox($identifier, $label=NULL, $value=NULL, $type=NULL) {
+		return $this->addItem(new HtmlFormCheckbox($identifier, $label, $value, $type));
 	}
 
-	public function addRadio($identifier, $name,$label=NULL,$value=NULL){
-		return $this->addItem(new HtmlFormRadio($identifier,$name,$label,$value));
+	public function addRadio($identifier, $name, $label=NULL, $value=NULL) {
+		return $this->addItem(new HtmlFormRadio($identifier, $name, $label, $value));
 	}
 }
\ No newline at end of file

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

Spacing +2 added lines, -2 removed lines

@@ -3,11 +3,11 @@
 namespace Ajax\semantic\html\collections\form;
 
 trait TextFieldsTrait {
-	public function setPlaceholder($value){
+	public function setPlaceholder($value) {
 		return $this->getField()->setPlaceholder($value);
 	}
 
-	public function setValue($value){
+	public function setValue($value) {
 		return $this->getField()->setValue($value);
 	}
 }
\ No newline at end of file

Ajax/semantic/traits/SemanticHtmlElementsTrait.php

Braces +1 added lines, -1 removed lines

@@ -36,7 +36,7 @@
 			foreach ($icons as $icon=>$size){
 				$group->addIcon($icon,$size);
 			}
-		}else{
+		} else{
 			foreach ($icons as $icon){
 				$group->addIcon($icon);
 			}

Spacing +31 added lines, -31 removed lines

@@ -44,8 +44,8 @@ 
 	 * @param boolean $asIcons
 	 * @return HtmlButtonGroups
 	 */
-	public function htmlButtonGroups($identifier,$elements=array(),$asIcons=false){
-		return $this->addHtmlComponent(new HtmlButtonGroups($identifier, $elements,$asIcons));
+	public function htmlButtonGroups($identifier, $elements=array(), $asIcons=false) {
+		return $this->addHtmlComponent(new HtmlButtonGroups($identifier, $elements, $asIcons));
 	}
 
 	/**
@@ -54,7 +54,7 @@ 
 	 * @param string $content
 	 * @return HtmlContainer
 	 */
-	public function htmlContainer($identifier,$content=""){
+	public function htmlContainer($identifier, $content="") {
 		return $this->addHtmlComponent(new HtmlContainer($identifier, $content));
 	}
 
@@ -63,8 +63,8 @@ 
 	 * @param string $content
 	 * @return HtmlDivider
 	 */
-	public function htmlDivider($identifier,$content="",$tagName="div"){
-		return $this->addHtmlComponent(new HtmlDivider($identifier, $content,$tagName));
+	public function htmlDivider($identifier, $content="", $tagName="div") {
+		return $this->addHtmlComponent(new HtmlDivider($identifier, $content, $tagName));
 	}
 
 	/**
@@ -74,8 +74,8 @@ 
 	 * @param string $type
 	 * @return HtmlHeader
 	 */
-	public function htmlHeader($identifier,$niveau=1,$content=NULL,$type="page"){
-		return $this->addHtmlComponent(new HtmlHeader($identifier,$niveau,$content,$type));
+	public function htmlHeader($identifier, $niveau=1, $content=NULL, $type="page") {
+		return $this->addHtmlComponent(new HtmlHeader($identifier, $niveau, $content, $type));
 	}
 
 	/**
@@ -83,7 +83,7 @@ 
 	 * @param string $icon
 	 * @return HtmlIcon
 	 */
-	public function htmlIcon($identifier,$icon){
+	public function htmlIcon($identifier, $icon) {
 		return $this->addHtmlComponent(new HtmlIcon($identifier, $icon));
 	}
 
@@ -93,14 +93,14 @@ 
 	 * @param array $icons
 	 * @return HtmlIconGroups
 	 */
-	public function htmlIconGroups($identifier,$size="",$icons=array()){
-		$group=new HtmlIconGroups($identifier,$size);
-		if(JArray::isAssociative($icons)){
-			foreach ($icons as $icon=>$size){
-				$group->add($icon,$size);
+	public function htmlIconGroups($identifier, $size="", $icons=array()) {
+		$group=new HtmlIconGroups($identifier, $size);
+		if (JArray::isAssociative($icons)) {
+			foreach ($icons as $icon=>$size) {
+				$group->add($icon, $size);
 			}
-		}else{
-			foreach ($icons as $icon){
+		}else {
+			foreach ($icons as $icon) {
 				$group->add($icon);
 			}
 		}
@@ -115,8 +115,8 @@ 
 	 * @param string $placeholder
 	 * @return HtmlInput
 	 */
-	public function htmlInput($identifier,$type="text",$value="",$placeholder=""){
-		return $this->addHtmlComponent(new HtmlInput($identifier,$type,$value,$placeholder));
+	public function htmlInput($identifier, $type="text", $value="", $placeholder="") {
+		return $this->addHtmlComponent(new HtmlInput($identifier, $type, $value, $placeholder));
 	}
 
 	/**
@@ -125,8 +125,8 @@ 
 	 * @param string $tagName
 	 * @return HtmlLabel
 	 */
-	public function htmlLabel($identifier,$content="",$tagName="div"){
-		return $this->addHtmlComponent(new HtmlLabel($identifier, $content,$tagName));
+	public function htmlLabel($identifier, $content="", $tagName="div") {
+		return $this->addHtmlComponent(new HtmlLabel($identifier, $content, $tagName));
 	}
 
 	/**
@@ -135,8 +135,8 @@ 
 	 * @param array $items
 	 * @return HtmlList
 	 */
-	public function htmlList($identifier,$items=array()){
-		return $this->addHtmlComponent(new HtmlList($identifier,$items));
+	public function htmlList($identifier, $items=array()) {
+		return $this->addHtmlComponent(new HtmlList($identifier, $items));
 	}
 
 	/**
@@ -145,8 +145,8 @@ 
 	 * @param string $content
 	 * @return HtmlSegment
 	 */
-	public function htmlSegment($identifier, $content=""){
-		return $this->addHtmlComponent(new HtmlSegment($identifier,$content));
+	public function htmlSegment($identifier, $content="") {
+		return $this->addHtmlComponent(new HtmlSegment($identifier, $content));
 	}
 
 	/**
@@ -155,8 +155,8 @@ 
 	 * @param array $items the segments
 	 * @return HtmlSegmentGroups
 	 */
-	public function htmlSegmentGroups($identifier, $items=array()){
-		return $this->addHtmlComponent(new HtmlSegmentGroups($identifier,$items));
+	public function htmlSegmentGroups($identifier, $items=array()) {
+		return $this->addHtmlComponent(new HtmlSegmentGroups($identifier, $items));
 	}
 
 	/**
@@ -165,8 +165,8 @@ 
 	 * @param mixed $value
 	 * @param CheckboxType $type
 	 */
-	public function htmlCheckbox($identifier, $label=NULL,$value=NULL,$type=NULL){
-		return $this->addHtmlComponent(new HtmlFormCheckbox($identifier,$label,$value,$type));
+	public function htmlCheckbox($identifier, $label=NULL, $value=NULL, $type=NULL) {
+		return $this->addHtmlComponent(new HtmlFormCheckbox($identifier, $label, $value, $type));
 	}
 
 	/**
@@ -176,11 +176,11 @@ 
 	 * @param RevealType|string $type
 	 * @param Direction|string $attributeType
 	 */
-	public function htmlReveal($identifier, $visibleContent,$hiddenContent,$type=RevealType::FADE,$attributeType=NULL){
-		return $this->addHtmlComponent(new HtmlReveal($identifier,$visibleContent,$hiddenContent,$type,$attributeType));
+	public function htmlReveal($identifier, $visibleContent, $hiddenContent, $type=RevealType::FADE, $attributeType=NULL) {
+		return $this->addHtmlComponent(new HtmlReveal($identifier, $visibleContent, $hiddenContent, $type, $attributeType));
 	}
 
-	public function htmlStep($identifier, $steps=array()){
-		return $this->addHtmlComponent(new HtmlStep($identifier,$steps));
+	public function htmlStep($identifier, $steps=array()) {
+		return $this->addHtmlComponent(new HtmlStep($identifier, $steps));
 	}
 }
\ No newline at end of file

Ajax/common/traits/JqueryEventsTrait.php

Doc Comments +9 added lines

@@ -3,7 +3,16 @@
 namespace Ajax\common\traits;
 
 trait JqueryEventsTrait {
+
+	/**
+	 * @param string $element
+	 */
 	public abstract function _prep_element($element);
+
+	/**
+	 * @param string $element
+	 * @param string $event
+	 */
 	public abstract function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false,$immediatly=true);
 
 	/**

Spacing +2 added lines, -2 removed lines

@@ -4,7 +4,7 @@ 
 
 trait JqueryEventsTrait {
 	public abstract function _prep_element($element);
-	public abstract function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false,$immediatly=true);
+	public abstract function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false, $immediatly=true);
 
 	/**
 	 * Blur
@@ -46,7 +46,7 @@ 
 	 */
 	public function _click($element='this', $js=array(), $ret_false=TRUE) {
 		if (!is_array($js)) {
-			$js=array (
+			$js=array(
 					$js
 			);
 		}

Ajax/semantic/html/modules/HtmlDropdown.php

Doc Comments +7 added lines, -1 removed lines

@@ -21,6 +21,9 @@ 
 	protected $params=array("action"=>"nothing","on"=>"hover");
 	protected $input;
 
+	/**
+	 * @param string $identifier
+	 */
 	public function __construct($identifier, $value="", $items=array()) {
 		parent::__construct($identifier, "div");
 		$this->_template=include dirname(__FILE__).'/../templates/tplDropdown.php';
@@ -47,7 +50,7 @@ 
 	/**
 	 * Insert an item at a position
 	 * @param mixed $item
-	 * @param number $position
+	 * @param integer $position
 	 * @return \Ajax\semantic\html\content\HtmlDropdownItem|unknown
 	 */
 	public function insertItem($item,$position=0){
@@ -196,6 +199,9 @@ 
 		}
 	}
 
+	/**
+	 * @param string $action
+	 */
 	public function setAction($action){
 		$this->params["action"]=$action;
 	}

Spacing +58 added lines, -58 removed lines

@@ -17,31 +17,31 @@ 
 	}
 	protected $mClass="menu";
 	protected $mTagName="div";
-	protected $items=array ();
-	protected $_params=array("action"=>"nothing","on"=>"hover");
+	protected $items=array();
+	protected $_params=array("action"=>"nothing", "on"=>"hover");
 	protected $input;
 
 	public function __construct($identifier, $value="", $items=array()) {
 		parent::__construct($identifier, "div");
 		$this->_template=include dirname(__FILE__).'/../templates/tplDropdown.php';
 		$this->setProperty("class", "ui dropdown");
-		$content=new HtmlSemDoubleElement("text-".$this->identifier,"div");
+		$content=new HtmlSemDoubleElement("text-".$this->identifier, "div");
 		$content->setClass("text");
 		$content->setContent($value);
-		$content->wrap("",new HtmlIcon("", "dropdown"));
+		$content->wrap("", new HtmlIcon("", "dropdown"));
 		$this->content=array($content);
 		$this->tagName="div";
 		$this->addItems($items);
 	}
 
-	public function addItem($item,$value=NULL,$image=NULL){
-		$itemO=$this->beforeAddItem($item,$value,$image);
+	public function addItem($item, $value=NULL, $image=NULL) {
+		$itemO=$this->beforeAddItem($item, $value, $image);
 		$this->items[]=$itemO;
 		return $itemO;
 	}
 
-	public function addIcon($icon,$before=true,$labeled=false){
-		$this->addIconP($icon,$before,$labeled);
+	public function addIcon($icon, $before=true, $labeled=false) {
+		$this->addIconP($icon, $before, $labeled);
 		return $this->getElementById("text-".$this->identifier, $this->content)->setWrapAfter("");
 	}
 	/**
@@ -50,20 +50,20 @@ 
 	 * @param number $position
 	 * @return \Ajax\semantic\html\content\HtmlDropdownItem|unknown
 	 */
-	public function insertItem($item,$position=0){
+	public function insertItem($item, $position=0) {
 		$itemO=$this->beforeAddItem($item);
-		 $start = array_slice($this->items, 0, $position);
-		 $end = array_slice($this->items, $position);
-		 $start[] = $item;
+		 $start=array_slice($this->items, 0, $position);
+		 $end=array_slice($this->items, $position);
+		 $start[]=$item;
 		 $this->items=array_merge($start, $end);
 		 return $itemO;
 	}
 
-	protected function beforeAddItem($item,$value=NULL,$image=NULL){
+	protected function beforeAddItem($item, $value=NULL, $image=NULL) {
 		$itemO=$item;
-		if(!$item instanceof HtmlDropdownItem){
-			$itemO=new HtmlDropdownItem("dd-item-".$this->identifier."-".\sizeof($this->items),$item,$value,$image);
-		}elseif($itemO instanceof HtmlDropdownItem){
+		if (!$item instanceof HtmlDropdownItem) {
+			$itemO=new HtmlDropdownItem("dd-item-".$this->identifier."-".\sizeof($this->items), $item, $value, $image);
+		}elseif ($itemO instanceof HtmlDropdownItem) {
 			$this->addToProperty("class", "vertical");
 		}
 		return $itemO;
@@ -76,76 +76,76 @@ 
 		$this->addItem($function($object));
 	}
 
-	public function addInput($name){
-		if(!isset($name))
+	public function addInput($name) {
+		if (!isset($name))
 			$name="input-".$this->identifier;
 		$this->setAction("activate");
-		$this->input=new HtmlInput($name,"hidden");
+		$this->input=new HtmlInput($name, "hidden");
 	}
 
-	public function addItems($items){
-		if(JArray::isAssociative($items)){
-			foreach ($items as $k=>$v){
+	public function addItems($items) {
+		if (JArray::isAssociative($items)) {
+			foreach ($items as $k=>$v) {
 				$this->addItem($v)->setData($k);
 			}
-		}else{
-			foreach ($items as $item){
+		}else {
+			foreach ($items as $item) {
 				$this->addItem($item);
 			}
 		}
 	}
 
-	public function count(){
+	public function count() {
 		return \sizeof($this->items);
 	}
 	/**
 	 * @param boolean $dropdown
 	 */
-	public function asDropdown($dropdown){
-		if($dropdown===false){
+	public function asDropdown($dropdown) {
+		if ($dropdown===false) {
 			$this->_template=include dirname(__FILE__).'/../templates/tplDropdownMenu.php';
 			$dropdown="menu";
-		}else{
+		}else {
 			$dropdown="dropdown";
 			$this->mClass="menu";
 		}
-		return $this->addToPropertyCtrl("class", $dropdown,array("menu","dropdown"));
+		return $this->addToPropertyCtrl("class", $dropdown, array("menu", "dropdown"));
 	}
 
-	public function setVertical(){
-		return $this->addToPropertyCtrl("class", "vertical",array("vertical"));
+	public function setVertical() {
+		return $this->addToPropertyCtrl("class", "vertical", array("vertical"));
 	}
 
-	public function setSimple(){
-		return $this->addToPropertyCtrl("class", "simple",array("simple"));
+	public function setSimple() {
+		return $this->addToPropertyCtrl("class", "simple", array("simple"));
 	}
 
-	public function asButton($floating=false){
-		if($floating)
+	public function asButton($floating=false) {
+		if ($floating)
 			$this->addToProperty("class", "floating");
 		return $this->addToProperty("class", "button");
 	}
 
-	public function asSelect($name=NULL,$multiple=false,$selection=true){
-		if(isset($name))
+	public function asSelect($name=NULL, $multiple=false, $selection=true) {
+		if (isset($name))
 			$this->addInput($name);
-		if($multiple)
+		if ($multiple)
 			$this->addToProperty("class", "multiple");
 		if ($selection)
-			$this->addToPropertyCtrl("class", "selection",array("selection"));
+			$this->addToPropertyCtrl("class", "selection", array("selection"));
 		return $this;
 	}
 
-	public function asSearch($name=NULL,$multiple=false,$selection=false){
-		$this->asSelect($name,$multiple,$selection);
+	public function asSearch($name=NULL, $multiple=false, $selection=false) {
+		$this->asSelect($name, $multiple, $selection);
 		return $this->addToProperty("class", "search");
 	}
 
-	public function setSelect($name=NULL,$multiple=false){
-		if(!isset($name))
+	public function setSelect($name=NULL, $multiple=false) {
+		if (!isset($name))
 			$name="select-".$this->identifier;
 		$this->input=null;
-		if($multiple){
+		if ($multiple) {
 			$this->setProperty("multiple", true);
 			$this->addToProperty("class", "multiple");
 		}
@@ -153,32 +153,32 @@ 
 		$this->tagName="select";
 		$this->setProperty("name", $name);
 		$this->content=null;
-		foreach ($this->items as $item){
+		foreach ($this->items as $item) {
 			$item->asOption();
 		}
 		return $this;
 	}
 
-	public function asSubmenu($pointing=NULL){
+	public function asSubmenu($pointing=NULL) {
 		$this->setClass("ui dropdown link item");
-		if(isset($pointing)){
+		if (isset($pointing)) {
 			$this->setPointing($pointing);
 		}
 		return $this;
 	}
 
-	public function setPointing($value=Direction::NONE){
-		return $this->addToPropertyCtrl("class", $value." pointing",Direction::getConstantValues("pointing"));
+	public function setPointing($value=Direction::NONE) {
+		return $this->addToPropertyCtrl("class", $value." pointing", Direction::getConstantValues("pointing"));
 	}
 
-	public function setValue($value){
-		if(isset($this->input)){
+	public function setValue($value) {
+		if (isset($this->input)) {
 			$this->input->setProperty("value", $value);
-		}else{
+		}else {
 			$this->setProperty("value", $value);
 		}
 		$textElement=$this->getElementById("text-".$this->identifier, $this->content);
-		if(isset($textElement))
+		if (isset($textElement))
 			$textElement->setContent($value);
 		return $this;
 	}
@@ -188,19 +188,19 @@ 
 	 * @see BaseHtml::run()
 	 */
 	public function run(JsUtils $js) {
-		if($this->propertyContains("class", "simple")===false){
-			if(isset($this->_bsComponent)===false)
-				$this->_bsComponent=$js->semantic()->dropdown("#".$this->identifier,$this->_params);
+		if ($this->propertyContains("class", "simple")===false) {
+			if (isset($this->_bsComponent)===false)
+				$this->_bsComponent=$js->semantic()->dropdown("#".$this->identifier, $this->_params);
 			$this->addEventsOnRun($js);
 			return $this->_bsComponent;
 		}
 	}
 
-	public function setAction($action){
+	public function setAction($action) {
 		$this->_params["action"]=$action;
 	}
 
-	public function setFullTextSearch($value){
+	public function setFullTextSearch($value) {
 		$this->_params["fullTextSearch"]=$value;
 	}
 }
\ No newline at end of file

Braces +28 added lines, -20 removed lines

@@ -63,7 +63,7 @@ 
 		$itemO=$item;
 		if(!$item instanceof HtmlDropdownItem){
 			$itemO=new HtmlDropdownItem("dd-item-".$this->identifier."-".\sizeof($this->items),$item,$value,$image);
-		}elseif($itemO instanceof HtmlDropdownItem){
+		} elseif($itemO instanceof HtmlDropdownItem){
 			$this->addToProperty("class", "vertical");
 		}
 		return $itemO;
@@ -77,8 +77,9 @@ 
 	}
 
 	public function addInput($name){
-		if(!isset($name))
-			$name="input-".$this->identifier;
+		if(!isset($name)) {
+					$name="input-".$this->identifier;
+		}
 		$this->setAction("activate");
 		$this->input=new HtmlInput($name,"hidden");
 	}
@@ -88,7 +89,7 @@ 
 			foreach ($items as $k=>$v){
 				$this->addItem($v)->setData($k);
 			}
-		}else{
+		} else{
 			foreach ($items as $item){
 				$this->addItem($item);
 			}
@@ -105,7 +106,7 @@ 
 		if($dropdown===false){
 			$this->_template=include dirname(__FILE__).'/../templates/tplDropdownMenu.php';
 			$dropdown="menu";
-		}else{
+		} else{
 			$dropdown="dropdown";
 			$this->mClass="menu";
 		}
@@ -121,18 +122,22 @@ 
 	}
 
 	public function asButton($floating=false){
-		if($floating)
-			$this->addToProperty("class", "floating");
+		if($floating) {
+					$this->addToProperty("class", "floating");
+		}
 		return $this->addToProperty("class", "button");
 	}
 
 	public function asSelect($name=NULL,$multiple=false,$selection=true){
-		if(isset($name))
-			$this->addInput($name);
-		if($multiple)
-			$this->addToProperty("class", "multiple");
-		if ($selection)
-			$this->addToPropertyCtrl("class", "selection",array("selection"));
+		if(isset($name)) {
+					$this->addInput($name);
+		}
+		if($multiple) {
+					$this->addToProperty("class", "multiple");
+		}
+		if ($selection) {
+					$this->addToPropertyCtrl("class", "selection",array("selection"));
+		}
 		return $this;
 	}
 
@@ -142,8 +147,9 @@ 
 	}
 
 	public function setSelect($name=NULL,$multiple=false){
-		if(!isset($name))
-			$name="select-".$this->identifier;
+		if(!isset($name)) {
+					$name="select-".$this->identifier;
+		}
 		$this->input=null;
 		if($multiple){
 			$this->setProperty("multiple", true);
@@ -174,12 +180,13 @@ 
 	public function setValue($value){
 		if(isset($this->input)){
 			$this->input->setProperty("value", $value);
-		}else{
+		} else{
 			$this->setProperty("value", $value);
 		}
 		$textElement=$this->getElementById("text-".$this->identifier, $this->content);
-		if(isset($textElement))
-			$textElement->setContent($value);
+		if(isset($textElement)) {
+					$textElement->setContent($value);
+		}
 		return $this;
 	}
 
@@ -189,8 +196,9 @@ 
 	 */
 	public function run(JsUtils $js) {
 		if($this->propertyContains("class", "simple")===false){
-			if(isset($this->_bsComponent)===false)
-				$this->_bsComponent=$js->semantic()->dropdown("#".$this->identifier,$this->_params);
+			if(isset($this->_bsComponent)===false) {
+							$this->_bsComponent=$js->semantic()->dropdown("#".$this->identifier,$this->_params);
+			}
 			$this->addEventsOnRun($js);
 			return $this->_bsComponent;
 		}

Ajax/bootstrap/traits/BootstrapComponentsTrait.php

Doc Comments +3 added lines

@@ -16,6 +16,9 @@
 
 trait BootstrapComponentsTrait {
 
+	/**
+	 * @param string|null $attachTo
+	 */
 	public abstract function addComponent(SimpleComponent $component, $attachTo, $params);
 	/**
 	 *

Unused Use Statements -1 removed lines

@@ -11,7 +11,6 @@
 use Ajax\bootstrap\components\Tab;
 use Ajax\bootstrap\components\Carousel;
 use Ajax\bootstrap\components\Collapse;
-use Ajax\Bootstrap;
 use Ajax\common\components\SimpleComponent;
 
 trait BootstrapComponentsTrait {