jcheron / phalcon-jquery

Ajax/Semantic.php

Spacing +21 added lines, -21 removed lines

@@ -20,7 +20,7 @@ 
 use Ajax\semantic\traits\SemanticHtmlElementsTrait;
 
 class Semantic extends BaseGui {
-	use SemanticComponentsTrait,SemanticHtmlElementsTrait;
+	use SemanticComponentsTrait, SemanticHtmlElementsTrait;
 	public function __construct($autoCompile=true) {
 		parent::__construct($autoCompile=true);
 	}
@@ -31,24 +31,24 @@ 
 	 * @param array $items
 	 * @return Ajax\semantic\html\collections\HtmlMenu
 	 */
-	public function htmlMenu($identifier,$items=array()){
-		return $this->addHtmlComponent(new HtmlMenu($identifier,$items));
+	public function htmlMenu($identifier, $items=array()) {
+		return $this->addHtmlComponent(new HtmlMenu($identifier, $items));
 	}
 
 	/**Adds an icon menu
 	 * @param string $identifier
 	 * @param array $items icons
 	 */
-	public function htmlIconMenu($identifier,$items=array()){
-		return $this->addHtmlComponent(new HtmlIconMenu($identifier,$items));
+	public function htmlIconMenu($identifier, $items=array()) {
+		return $this->addHtmlComponent(new HtmlIconMenu($identifier, $items));
 	}
 
 	/**Adds an labeled icon menu
 	 * @param string $identifier
 	 * @param array $items icons
 	 */
-	public function htmlLabeledIconMenu($identifier,$items=array()){
-		return $this->addHtmlComponent(new HtmlLabeledIconMenu($identifier,$items));
+	public function htmlLabeledIconMenu($identifier, $items=array()) {
+		return $this->addHtmlComponent(new HtmlLabeledIconMenu($identifier, $items));
 	}
 
 	/**
@@ -56,8 +56,8 @@ 
 	 * @param string $value
 	 * @param array $items
 	 */
-	public function htmlDropdown($identifier, $value="", $items=array()){
-		return $this->addHtmlComponent(new HtmlDropdown($identifier,$value,$items));
+	public function htmlDropdown($identifier, $value="", $items=array()) {
+		return $this->addHtmlComponent(new HtmlDropdown($identifier, $value, $items));
 	}
 
 	/**
@@ -65,16 +65,16 @@ 
 	 * @param string $identifier
 	 * @param string $content
 	 */
-	public function htmlMessage($identifier, $content=""){
-		return $this->addHtmlComponent(new HtmlMessage($identifier,$content));
+	public function htmlMessage($identifier, $content="") {
+		return $this->addHtmlComponent(new HtmlMessage($identifier, $content));
 	}
 
 	/**
 	 * @param string $identifier
 	 * @param mixed $content
 	 */
-	public function htmlPopup(BaseHtml $container,$identifier,$content){
-		return $this->addHtmlComponent(new HtmlPopup($container,$identifier,$content));
+	public function htmlPopup(BaseHtml $container, $identifier, $content) {
+		return $this->addHtmlComponent(new HtmlPopup($container, $identifier, $content));
 	}
 
 	/**
@@ -84,8 +84,8 @@ 
 	 * @param boolean $createCols
 	 * @param boolean $implicitRows
 	 */
-	public function htmlGrid($identifier,$numRows=1,$numCols=NULL,$createCols=true,$implicitRows=false){
-		return $this->addHtmlComponent(new HtmlGrid($identifier,$numRows,$numCols,$createCols,$implicitRows));
+	public function htmlGrid($identifier, $numRows=1, $numCols=NULL, $createCols=true, $implicitRows=false) {
+		return $this->addHtmlComponent(new HtmlGrid($identifier, $numRows, $numCols, $createCols, $implicitRows));
 	}
 
 
@@ -98,8 +98,8 @@ 
 	 * @param function $hrefFunction the function who generates the href elements. default : function($e){return $e->getContent()}
 	 * @return HtmlBreadcrumb
 	 */
-	public function htmlBreadcrumb( $identifier,$items=array(),$autoActive=true,$startIndex=0,$hrefFunction=NULL){
-		return $this->addHtmlComponent(new HtmlBreadcrumb($identifier,$items,$autoActive,$startIndex,$hrefFunction));
+	public function htmlBreadcrumb($identifier, $items=array(), $autoActive=true, $startIndex=0, $hrefFunction=NULL) {
+		return $this->addHtmlComponent(new HtmlBreadcrumb($identifier, $items, $autoActive, $startIndex, $hrefFunction));
 	}
 
 	/**
@@ -116,8 +116,8 @@ 
 	 * @param string $identifier
 	 * @return HtmlAccordion
 	 */
-	public function htmlAccordionMenu($identifier,$items=array()) {
-		return $this->addHtmlComponent(new HtmlAccordionMenu($identifier,$items));
+	public function htmlAccordionMenu($identifier, $items=array()) {
+		return $this->addHtmlComponent(new HtmlAccordionMenu($identifier, $items));
 	}
 
 	/**
@@ -125,7 +125,7 @@ 
 	 * @param string $identifier
 	 * @param array $elements
 	 */
-	public function htmlForm($identifier,$elements=array()) {
-		return $this->addHtmlComponent(new HtmlForm($identifier,$elements));
+	public function htmlForm($identifier, $elements=array()) {
+		return $this->addHtmlComponent(new HtmlForm($identifier, $elements));
 	}
 }
\ No newline at end of file

Ajax/common/traits/JqueryActionsTrait.php

Spacing +7 added lines, -7 removed lines

@@ -16,7 +16,7 @@ 
 		if (isset($value)) {
 			$value=$this->_prep_value($value);
 			$str="$({$element}).attr(\"$attributeName\",{$value});";
-		} else
+		}else
 			$str="$({$element}).attr(\"$attributeName\");";
 			if ($immediatly)
 				$this->jquery_code_for_compile[]=$str;
@@ -30,7 +30,7 @@ 
 	 * @param boolean $immediatly defers the execution if set to false
 	 * @return string
 	 */
-	public function after($element='this', $value='', $immediatly=false){
+	public function after($element='this', $value='', $immediatly=false) {
 		$element=$this->_prep_element($element);
 		$value=$this->_prep_value($value);
 		$str="$({$element}).after({$value});";
@@ -55,7 +55,7 @@ 
 
 		$animations="\t\t\t";
 		if (is_array($params)) {
-			foreach ( $params as $param => $value ) {
+			foreach ($params as $param => $value) {
 				$animations.=$param.': \''.$value.'\', ';
 			}
 		}
@@ -348,8 +348,8 @@ 
 	 * @param boolean $immediatly
 	 * @return string
 	 */
-	public function _doJQueryOn($event, $element, $elementToModify, $jqueryCall, $param="", $preventDefault=false, $stopPropagation=false, $jsCallback="",$immediatly=true) {
-		return $this->_add_event($element, $this->_doJQuery($elementToModify, $jqueryCall, $param, $jsCallback), $event, $preventDefault, $stopPropagation,$immediatly);
+	public function _doJQueryOn($event, $element, $elementToModify, $jqueryCall, $param="", $preventDefault=false, $stopPropagation=false, $jsCallback="", $immediatly=true) {
+		return $this->_add_event($element, $this->_doJQuery($elementToModify, $jqueryCall, $param, $jsCallback), $event, $preventDefault, $stopPropagation, $immediatly);
 	}
 
 	/**
@@ -375,7 +375,7 @@ 
 	 * @param boolean $immediatly
 	 * @return String
 	 */
-	public function _execOn($element, $event, $js, $preventDefault=false, $stopPropagation=false,$immediatly=true) {
-		return $this->_add_event($element, $this->_exec($js), $event, $preventDefault, $stopPropagation,$immediatly);
+	public function _execOn($element, $event, $js, $preventDefault=false, $stopPropagation=false, $immediatly=true) {
+		return $this->_add_event($element, $this->_exec($js), $event, $preventDefault, $stopPropagation, $immediatly);
 	}
 }
\ No newline at end of file

Ajax/common/traits/JsUtilsAjaxTrait.php

Spacing +19 added lines, -19 removed lines

@@ -17,8 +17,8 @@ 
 	 * @param string $jsCallback javascript code to execute after the request
 	 * @param boolean $hasLoader true for showing ajax loader. default : true
 	 */
-	public function get($url, $responseElement="", $params="{}", $jsCallback=NULL,$hasLoader=true) {
-		return $this->js->_get($url, $params, $responseElement, $jsCallback, NULL, $hasLoader,true);
+	public function get($url, $responseElement="", $params="{}", $jsCallback=NULL, $hasLoader=true) {
+		return $this->js->_get($url, $params, $responseElement, $jsCallback, NULL, $hasLoader, true);
 	}
 
 	/**
@@ -29,8 +29,8 @@ 
 	 * @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) {
-		return $this->js->_json($url, $method, $params, $jsCallback, $attr, $context,$immediatly);
+	public function json($url, $method="get", $params="{}", $jsCallback=NULL, $attr="id", $context="document", $immediatly=false) {
+		return $this->js->_json($url, $method, $params, $jsCallback, $attr, $context, $immediatly);
 	}
 
 	/**
@@ -40,8 +40,8 @@ 
 	 * @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()) {
-		return $this->js->_jsonOn($event, $element, $url,$parameters);
+	public function jsonOn($event, $element, $url, $parameters=array()) {
+		return $this->js->_jsonOn($event, $element, $url, $parameters);
 	}
 
 	/**
@@ -85,8 +85,8 @@ 
 	 * @param string $url the request url
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","params"=>"{}","method"=>"get","immediatly"=>true)
 	 */
-	public function jsonArrayOn($event,$element,$maskSelector, $url,$parameters=array()) {
-		return $this->js->_jsonArrayOn($event,$element,$maskSelector, $url, $parameters);
+	public function jsonArrayOn($event, $element, $maskSelector, $url, $parameters=array()) {
+		return $this->js->_jsonArrayOn($event, $element, $maskSelector, $url, $parameters);
 	}
 
 	/**
@@ -98,7 +98,7 @@ 
 	 * @param string $jsCallback javascript code to execute after the request
 	 * @param string $attr the html attribute added to the request
 	 */
-	public function getDeferred($url, $responseElement="", $params="{}", $jsCallback=NULL,$attr="id") {
+	public function getDeferred($url, $responseElement="", $params="{}", $jsCallback=NULL, $attr="id") {
 		return $this->js->_get($url, $params, $responseElement, $jsCallback, $attr, false);
 	}
 
@@ -136,8 +136,8 @@ 
 	 * @param string $jsCallback javascript code to execute after the request
 	 * @param boolean $hasLoader true for showing ajax loader. default : true
 	 */
-	public function post($url, $responseElement="", $params="{}", $jsCallback=NULL,$hasLoader=true) {
-		return $this->js->_post($url, $params, $responseElement, $jsCallback, NULL, $hasLoader,true);
+	public function post($url, $responseElement="", $params="{}", $jsCallback=NULL, $hasLoader=true) {
+		return $this->js->_post($url, $params, $responseElement, $jsCallback, NULL, $hasLoader, true);
 	}
 
 	/**
@@ -150,8 +150,8 @@ 
 	 * @param string $jsCallback javascript code to execute after the request
 	 * @param boolean $hasLoader true for showing ajax loader. default : true
 	 */
-	public function postDeferred($url, $responseElement="", $params="{}", $jsCallback=NULL, $attr="id",$hasLoader=true) {
-		return $this->js->_post($url, $params, $responseElement, $jsCallback, $attr, $hasLoader,false);
+	public function postDeferred($url, $responseElement="", $params="{}", $jsCallback=NULL, $attr="id", $hasLoader=true) {
+		return $this->js->_post($url, $params, $responseElement, $jsCallback, $attr, $hasLoader, false);
 	}
 
 	/**
@@ -165,7 +165,7 @@ 
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"immediatly"=>true)
 	 */
 	public function postOn($event, $element, $url, $params="{}", $responseElement="", $parameters=array()) {
-		return $this->js->_postOn($event, $element,  $url, $params, $responseElement, $parameters);
+		return $this->js->_postOn($event, $element, $url, $params, $responseElement, $parameters);
 	}
 
 	/**
@@ -189,8 +189,8 @@ 
 	 * @param string $jsCallback javascript code to execute after the request
 	 * @param boolean $hasLoader true for showing ajax loader. default : true
 	 */
-	public function postForm($url, $form, $responseElement, $validation=false, $jsCallback=NULL,$hasLoader=true) {
-		return $this->js->_postForm($url, $form, $responseElement, $validation, $jsCallback, NULL, $hasLoader,true);
+	public function postForm($url, $form, $responseElement, $validation=false, $jsCallback=NULL, $hasLoader=true) {
+		return $this->js->_postForm($url, $form, $responseElement, $validation, $jsCallback, NULL, $hasLoader, true);
 	}
 
 	/**
@@ -203,8 +203,8 @@ 
 	 * @param string $attr the html attribute added to the request
 	 * @param boolean $hasLoader true for showing ajax loader. default : true
 	 */
-	public function postFormDeferred($url, $form, $responseElement, $validation=false, $jsCallback=NULL,$attr="id",$hasLoader=true) {
-		return $this->js->_postForm($url, $form, $responseElement, $validation, $jsCallback, $attr, $hasLoader,false);
+	public function postFormDeferred($url, $form, $responseElement, $validation=false, $jsCallback=NULL, $attr="id", $hasLoader=true) {
+		return $this->js->_postForm($url, $form, $responseElement, $validation, $jsCallback, $attr, $hasLoader, false);
 	}
 
 	/**
@@ -218,7 +218,7 @@ 
 	 * @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()) {
-		return $this->js->_postFormOn($event,$element, $url, $form, $responseElement, $parameters);
+		return $this->js->_postFormOn($event, $element, $url, $form, $responseElement, $parameters);
 	}
 
 	/**

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

Spacing +35 added lines, -35 removed lines

@@ -9,7 +9,7 @@ 
 		$loading_notifier='<div class="ajax-loader">';
 		if ($this->ajaxLoader=='') {
 			$loading_notifier.="Loading...";
-		} else {
+		}else {
 			$loading_notifier.=$this->ajaxLoader;
 		}
 		$loading_notifier.='</div>';
@@ -17,20 +17,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";
@@ -40,22 +40,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";
@@ -64,7 +64,7 @@ 
 		return $retour;
 	}
 
-	protected function _getResponseElement($responseElement){
+	protected function _getResponseElement($responseElement) {
 		if ($responseElement!=="") {
 			$responseElement=$this->_prep_value($responseElement);
 		}
@@ -74,7 +74,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;
@@ -88,7 +88,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";
@@ -109,7 +109,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;
@@ -119,7 +119,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);
 	}
 
 	/**
@@ -131,19 +131,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";
@@ -158,26 +158,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";
@@ -204,7 +204,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;
@@ -212,7 +212,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);
 	}
 
 	/**
@@ -225,7 +225,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;
@@ -233,7 +233,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);
 	}
 
 	/**
@@ -246,7 +246,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;
@@ -255,6 +255,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/common/traits/JqueryEventsTrait.php

Spacing +1 added lines, -1 removed lines

@@ -44,7 +44,7 @@
 	 */
 	public function _click($element='this', $js=array(), $ret_false=TRUE) {
 		if (!is_array($js)) {
-			$js=array (
+			$js=array(
 					$js
 			);
 		}

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

Spacing +25 added lines, -25 removed lines

@@ -15,26 +15,26 @@ 
 	protected $_equalWidth;
 	protected $_name;
 
-	public function __construct($identifier, $fields=array(),$equalWidth=true) {
+	public function __construct($identifier, $fields=array(), $equalWidth=true) {
 		parent::__construct($identifier, "div");
 		$this->_equalWidth=$equalWidth;
 		$this->addItems($fields);
 	}
 
-	public function addFields($fields=NULL,$label=NULL){
-		if(!$fields instanceof HtmlFormFields){
-			if(\is_array($fields)===false){
-				$fields = \func_get_args();
+	public function addFields($fields=NULL, $label=NULL) {
+		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;
 			}
 		}
-		if(isset($label))
+		if (isset($label))
 			$this->setLabel($label);
-		foreach ($fields as $field){
+		foreach ($fields as $field) {
 			$this->addItem($field);
 		}
 		return $this;
@@ -44,39 +44,39 @@ 
 	 * @param string|HtmlSemDoubleElement $label
 	 * @return \Ajax\semantic\html\base\HtmlSemDoubleElement
 	 */
-	public function setLabel($label){
+	public function setLabel($label) {
 		$labelO=$label;
-		if(\is_string($label)){
-			$labelO=new HtmlSemDoubleElement("","label","",$label);
+		if (\is_string($label)) {
+			$labelO=new HtmlSemDoubleElement("", "label", "", $label);
 		}
-		$this->insertItem($labelO,0);
+		$this->insertItem($labelO, 0);
 		return $labelO;
 	}
-	public function addItem($item){
+	public function addItem($item) {
 		$item=parent::addItem($item);
 		$item->setContainer($this);
 		return $item;
 	}
-	public function compile(JsUtils $js=NULL,View $view=NULL){
-		if($this->_equalWidth){
+	public function compile(JsUtils $js=NULL, View $view=NULL) {
+		if ($this->_equalWidth) {
 			$count=$this->count();
 			$this->addToProperty("class", Wide::getConstants()["W".$count]." fields");
 		}else
-			$this->addToProperty("class","fields");
-		return parent::compile($js,$view);
+			$this->addToProperty("class", "fields");
+		return parent::compile($js, $view);
 	}
 
-	public function setWidth($index,$width){
+	public function setWidth($index, $width) {
 		$this->_equalWidth=false;
 		return $this->getItem($index)->setWidth($width);
 	}
 
-	public function setInline(){
+	public function setInline() {
 		$this->_equalWidth=false;
 		$this->addToProperty("class", "inline");
 	}
 
-	public function setGrouped(){
+	public function setGrouped() {
 		$this->_equalWidth=false;
 		$this->addToProperty("class", "grouped");
 	}
@@ -90,14 +90,14 @@ 
 		return $this;
 	}
 
-	public static function radios($name,$items=array(),$label=NULL){
+	public static function radios($name, $items=array(), $label=NULL) {
 		$fields=array();
 		$i=0;
-		foreach ($items as $item){
-			$fields[]=new HtmlFormRadio($name."-".$i++,$name,$item,$item);
+		foreach ($items as $item) {
+			$fields[]=new HtmlFormRadio($name."-".$i++, $name, $item, $item);
 		}
-		$radios=new HtmlFormFields("fields-".$name,$fields);
-		if(isset($label))
+		$radios=new HtmlFormFields("fields-".$name, $fields);
+		if (isset($label))
 			$radios->setLabel($label)->setProperty("for", $name);
 		return $radios;
 	}

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

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

Spacing +20 added lines, -20 removed lines

@@ -8,26 +8,26 @@ 
 
 class HtmlFormField extends HtmlSemDoubleElement {
 	protected $_container;
-	public function __construct($identifier, $field,$label=NULL) {
-		parent::__construct($identifier, "div","field");
+	public function __construct($identifier, $field, $label=NULL) {
+		parent::__construct($identifier, "div", "field");
 		$this->content=array();
-		$this->_states=[State::ERROR,State::DISABLED];
-		if(isset($label))
+		$this->_states=[State::ERROR, State::DISABLED];
+		if (isset($label))
 			$this->setLabel($label);
 		$this->setField($field);
 	}
 
-	public function setLabel($label){
+	public function setLabel($label) {
 		$labelO=$label;
-		if(\is_string($label)){
-			$labelO=new HtmlSemDoubleElement("","label");
+		if (\is_string($label)) {
+			$labelO=new HtmlSemDoubleElement("", "label");
 			$labelO->setContent($label);
-			$labelO->setProperty("for", \str_replace("field-", "",$this->identifier));
+			$labelO->setProperty("for", \str_replace("field-", "", $this->identifier));
 		}
 		$this->content["label"]=$labelO;
 	}
 
-	public function setField($field){
+	public function setField($field) {
 		$this->content["field"]=$field;
 	}
 
@@ -35,8 +35,8 @@ 
 	 * Returns the label or null
 	 * @return mixed
 	 */
-	public function getLabel(){
-		if(\array_key_exists("label", $this->content))
+	public function getLabel() {
+		if (\array_key_exists("label", $this->content))
 			return $this->content["label"];
 	}
 
@@ -44,14 +44,14 @@ 
 	 * Return the field
 	 * @return mixed
 	 */
-	public function getField(){
+	public function getField() {
 		return $this->content["field"];
 	}
 
 	/**
 	 * puts the label before or behind
 	 */
-	public function swapLabel(){
+	public function swapLabel() {
 		$label=$this->getLabel();
 		unset($this->content["label"]);
 		$this->content["label"]=$label;
@@ -62,27 +62,27 @@ 
 	 * @param int $width
 	 * @return \Ajax\semantic\html\collections\form\HtmlFormField
 	 */
-	public function setWidth($width){
-		if(\is_int($width)){
+	public function setWidth($width) {
+		if (\is_int($width)) {
 			$width=Wide::getConstants()["W".$width];
 		}
 		$this->addToPropertyCtrl("class", $width, Wide::getConstants());
-		if(isset($this->_container)){
+		if (isset($this->_container)) {
 			$this->_container->setEqualWidth(false);
 		}
-		return $this->addToPropertyCtrl("class", "wide",array("wide"));
+		return $this->addToPropertyCtrl("class", "wide", array("wide"));
 	}
 
 	/**
 	 * Field displays an error state
 	 * @return \Ajax\semantic\html\collections\form\HtmlFormField
 	 */
-	public function setError(){
+	public function setError() {
 		return $this->addToProperty("class", "error");
 	}
 
-	public function jsState($state){
-		return $this->jsDoJquery("addClass",$state);
+	public function jsState($state) {
+		return $this->jsDoJquery("addClass", $state);
 	}
 
 	public function setContainer($_container) {