phpMv / phpMv-UI

Ajax/common/traits/JsUtilsEventsTrait.php

Spacing +8 added lines, -8 removed lines

@@ -11,11 +11,11 @@ 
 trait JsUtilsEventsTrait {
 
 
-	protected $jquery_events=array (
-			"bind","blur","change","click","dblclick","delegate","die","error","focus","focusin","focusout","hover","keydown","keypress","keyup","live","load","mousedown","mousseenter","mouseleave","mousemove","mouseout","mouseover","mouseup","off","on","one","ready","resize","scroll","select","submit","toggle","trigger","triggerHandler","undind","undelegate","unload"
+	protected $jquery_events=array(
+			"bind", "blur", "change", "click", "dblclick", "delegate", "die", "error", "focus", "focusin", "focusout", "hover", "keydown", "keypress", "keyup", "live", "load", "mousedown", "mousseenter", "mouseleave", "mousemove", "mouseout", "mouseover", "mouseup", "off", "on", "one", "ready", "resize", "scroll", "select", "submit", "toggle", "trigger", "triggerHandler", "undind", "undelegate", "unload"
 	);
 
-	abstract public function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false,$immediatly=true);
+	abstract public function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false, $immediatly=true);
 
 	/**
 	 * Outputs a javascript library blur event
@@ -37,8 +37,8 @@ 
 	 * @param boolean $stopPropagation
 	 * @return string
 	 */
-	public function change($element='this', $js='',$preventDefault=false,$stopPropagation=false) {
-		return $this->_add_event($element, $js, 'change',$preventDefault,$stopPropagation);
+	public function change($element='this', $js='', $preventDefault=false, $stopPropagation=false) {
+		return $this->_add_event($element, $js, 'change', $preventDefault, $stopPropagation);
 	}
 
 	/**
@@ -51,9 +51,9 @@ 
 	 * @param boolean $stopPropagation
 	 * @return string
 	 */
-	public function click($element='this', $js='', $ret_false=TRUE,$preventDefault=false,$stopPropagation=false) {
+	public function click($element='this', $js='', $ret_false=TRUE, $preventDefault=false, $stopPropagation=false) {
 		if (!is_array($js)) {
-			$js=array (
+			$js=array(
 					$js
 			);
 		}
@@ -62,7 +62,7 @@ 
 			$js[]="return false;";
 		}
 
-		return $this->_add_event($element, $js, 'click',$preventDefault,$stopPropagation);
+		return $this->_add_event($element, $js, 'click', $preventDefault, $stopPropagation);
 	}
 
 	/**

Ajax/common/traits/JsUtilsAjaxTrait.php

Spacing +93 added lines, -93 removed lines

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

Braces +27 added lines, -20 removed lines

@@ -52,8 +52,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;
 	}
 
@@ -89,12 +90,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;
 	}
@@ -104,13 +106,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;
@@ -125,8 +128,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);
 			}
@@ -146,8 +150,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);
 	}
@@ -176,8 +181,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;
+			}
 		}
 	}
 
@@ -295,7 +301,7 @@ 
 		if($context===null){
 			$parent="$('".$maskSelector."').parent()";
 			$newElm = "$('#'+newId)";
-		}else{
+		} else{
 			$parent=$context;
 			$newElm = $context.".find('#'+newId)";
 		}
@@ -497,8 +503,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/service/AjaxCall.php

Spacing +5 added lines, -5 removed lines

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

Braces +3 added lines, -2 removed lines

@@ -14,8 +14,9 @@
 	}
 
 	public function compile(JsUtils $js=null) {
-		if ($js===null)
-			return;
+		if ($js===null) {
+					return;
+		}
 		$params="{}";
 		$stopPropagation=true;
 		$preventDefault=true;

Ajax/php/symfony/JsUtils.php

Spacing +25 added lines, -25 removed lines

@@ -6,44 +6,44 @@ 
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
 use Ajax\service\JString;
-class JsUtils extends \Ajax\JsUtils{
+class JsUtils extends \Ajax\JsUtils {
 
-	public function getUrl($url){
+	public function getUrl($url) {
 		$router=$this->getInjected();
-		if(isset($router)){
+		if (isset($router)) {
 			try {
 				$url=$router->generate($url);
-			}catch (\Exception $e){
+			}catch (\Exception $e) {
 				return $url;
 			}
 		}
 		return $url;
 	}
-	public function addViewElement($identifier,$content,&$view){
-		if(\is_array($view)){
-			if(\array_key_exists("q", $view)===false){
+	public function addViewElement($identifier, $content, &$view) {
+		if (\is_array($view)) {
+			if (\array_key_exists("q", $view)===false) {
 				$view["q"]=array();
 			}
 			$view["q"][$identifier]=$content;
-		}elseif($view instanceof \Twig_Environment){
+		}elseif ($view instanceof \Twig_Environment) {
 			$vars=$view->getGlobals();
-			if(\array_key_exists("q", $vars)===false){
+			if (\array_key_exists("q", $vars)===false) {
 				$vars["q"]=array();
 			}
 			$vars["q"][$identifier]=$content;
-			$view->addGlobal("q",$vars["q"]);
+			$view->addGlobal("q", $vars["q"]);
 		}
 	}
 
-	public function createScriptVariable(&$view,$view_var, $output){
+	public function createScriptVariable(&$view, $view_var, $output) {
 		$this->addVariable($view_var, $output, $view);
 	}
 
-	protected function addVariable($key,$value,&$view){
-		if(\is_array($view)){
+	protected function addVariable($key, $value, &$view) {
+		if (\is_array($view)) {
 			$view[$key]=$value;
-		}elseif($view instanceof \Twig_Environment){
-			$view->addGlobal($key,$value);
+		}elseif ($view instanceof \Twig_Environment) {
+			$view->addGlobal($key, $value);
 		}
 	}
 
@@ -54,17 +54,17 @@ 
 	 * @param array $params
 	 * @see \Ajax\JsUtils::forward()
 	 */
-	public function forward($initialControllerInstance,$controllerName,$actionName,$params=array()){
+	public function forward($initialControllerInstance, $controllerName, $actionName, $params=array()) {
 		$path=$params;
-		$request = $initialControllerInstance->get('request_stack')->getCurrentRequest();
-		$path['_forwarded'] = $request->attributes;
-		$path['_controller'] = $controllerName.":".$actionName;
-		$subRequest = $request->duplicate([], null, $path);
-		$response= $initialControllerInstance->get('http_kernel')->handle($subRequest, HttpKernelInterface::SUB_REQUEST);
+		$request=$initialControllerInstance->get('request_stack')->getCurrentRequest();
+		$path['_forwarded']=$request->attributes;
+		$path['_controller']=$controllerName.":".$actionName;
+		$subRequest=$request->duplicate([], null, $path);
+		$response=$initialControllerInstance->get('http_kernel')->handle($subRequest, HttpKernelInterface::SUB_REQUEST);
 		return $response->getContent();
 	}
 
-	public function renderContent($initialControllerInstance,$viewName, $params=NULL) {
+	public function renderContent($initialControllerInstance, $viewName, $params=NULL) {
 		if ($initialControllerInstance->has('templating')) {
 			return $initialControllerInstance->get('templating')->render($viewName, $params);
 		}
@@ -76,10 +76,10 @@ 
 		return $initialControllerInstance->get('twig')->render($viewName, $params);
 	}
 
-	public function fromDispatcher($dispatcher){
-		$request = $dispatcher->get('request_stack')->getCurrentRequest();
+	public function fromDispatcher($dispatcher) {
+		$request=$dispatcher->get('request_stack')->getCurrentRequest();
 		$uri=$request->getPathInfo();
-		if(JString::startswith($uri, "/")){
+		if (JString::startswith($uri, "/")) {
 			$uri=\substr($uri, 1);
 		}
 		return \explode("/", $uri);

Braces +3 added lines, -3 removed lines

@@ -13,7 +13,7 @@ 
 		if(isset($router)){
 			try {
 				$url=$router->generate($url);
-			}catch (\Exception $e){
+			} catch (\Exception $e){
 				return $url;
 			}
 		}
@@ -25,7 +25,7 @@ 
 				$view["q"]=array();
 			}
 			$view["q"][$identifier]=$content;
-		}elseif($view instanceof \Twig_Environment){
+		} elseif($view instanceof \Twig_Environment){
 			$vars=$view->getGlobals();
 			if(\array_key_exists("q", $vars)===false){
 				$vars["q"]=array();
@@ -42,7 +42,7 @@ 
 	protected function addVariable($key,$value,&$view){
 		if(\is_array($view)){
 			$view[$key]=$value;
-		}elseif($view instanceof \Twig_Environment){
+		} elseif($view instanceof \Twig_Environment){
 			$view->addGlobal($key,$value);
 		}
 	}

Ajax/php/ubiquity/JsUtils.php

Spacing +12 added lines, -12 removed lines

@@ -4,34 +4,34 @@
 
 use Ubiquity\controllers\Startup;
 use Ubiquity\utils\RequestUtils;
-class JsUtils extends \Ajax\JsUtils{
+class JsUtils extends \Ajax\JsUtils {
 
-	public function getUrl($url){
+	public function getUrl($url) {
 		return RequestUtils::getUrl($url);
 	}
 
-	public function addViewElement($identifier,$content,&$view){
+	public function addViewElement($identifier, $content, &$view) {
 		$controls=$view->getVar("q");
-		if (isset($controls) === false) {
-			$controls=array ();
+		if (isset($controls)===false) {
+			$controls=array();
 		}
 		$controls[$identifier]=$content;
 		$view->setVar("q", $controls);
 	}
 
-	public function createScriptVariable(&$view,$view_var, $output){
-		$view->setVar($view_var,$output);
+	public function createScriptVariable(&$view, $view_var, $output) {
+		$view->setVar($view_var, $output);
 	}
 
-	public function forward($initialController,$controller,$action,$params=array()){
-		return $initialController->forward($controller,$action,$params,true,true,true);
+	public function forward($initialController, $controller, $action, $params=array()) {
+		return $initialController->forward($controller, $action, $params, true, true, true);
 	}
 
-	public function renderContent($initialControllerInstance,$viewName, $params=NULL) {
-		return $initialControllerInstance->loadView($viewName,$params,true);
+	public function renderContent($initialControllerInstance, $viewName, $params=NULL) {
+		return $initialControllerInstance->loadView($viewName, $params, true);
 	}
 
-	public function fromDispatcher($dispatcher){
+	public function fromDispatcher($dispatcher) {
 		return Startup::$urlParts;
 	}
 }

Ajax/common/html/BaseHtml.php

Spacing +42 added lines, -42 removed lines

@@ -14,11 +14,11 @@ 
  * @version 1.3
  */
 abstract class BaseHtml extends BaseWidget {
-	use BaseHtmlEventsTrait,BaseHtmlPropertiesTrait;
+	use BaseHtmlEventsTrait, BaseHtmlPropertiesTrait;
 	protected $_template;
 	protected $tagName;
-	protected $_wrapBefore=array ();
-	protected $_wrapAfter=array ();
+	protected $_wrapBefore=array();
+	protected $_wrapAfter=array();
 	protected $_bsComponent;
 	protected $_compiled=false;
 	protected $_postCompile;
@@ -31,14 +31,14 @@ 
 	 */
 	abstract public function run(JsUtils $js);
 
-	private function _callSetter($setter,$key,$value,&$array){
+	private function _callSetter($setter, $key, $value, &$array) {
 		$result=false;
-		if (method_exists($this, $setter) && substr($setter, 0, 1) !== "_") {
+		if (method_exists($this, $setter) && substr($setter, 0, 1)!=="_") {
 			try {
 				$this->$setter($value);
 				unset($array[$key]);
 				$result=true;
-			} catch ( \Exception $e ) {
+			}catch (\Exception $e) {
 				$result=false;
 			}
 		}
@@ -46,17 +46,17 @@ 
 	}
 
 	protected function getTemplate(JsUtils $js=NULL) {
-		return PropertyWrapper::wrap($this->_wrapBefore, $js) . $this->_template . PropertyWrapper::wrap($this->_wrapAfter, $js);
+		return PropertyWrapper::wrap($this->_wrapBefore, $js).$this->_template.PropertyWrapper::wrap($this->_wrapAfter, $js);
 	}
 
 	protected function ctrl($name, $value, $typeCtrl) {
 		if (\is_array($typeCtrl)) {
-			if (array_search($value, $typeCtrl) === false) {
-				throw new \Exception("La valeur passée `" . $value . "` à la propriété `" . $name . "` ne fait pas partie des valeurs possibles : {" . implode(",", $typeCtrl) . "}");
+			if (array_search($value, $typeCtrl)===false) {
+				throw new \Exception("La valeur passée `".$value."` à la propriété `".$name."` ne fait pas partie des valeurs possibles : {".implode(",", $typeCtrl)."}");
 			}
 		} else {
 			if (!$typeCtrl($value)) {
-				throw new \Exception("La fonction " . $typeCtrl . " a retourné faux pour l'affectation de la propriété " . $name);
+				throw new \Exception("La fonction ".$typeCtrl." a retourné faux pour l'affectation de la propriété ".$name);
 			}
 		}
 		return true;
@@ -65,7 +65,7 @@ 
 
 
 	protected function setMemberCtrl(&$name, $value, $typeCtrl) {
-		if ($this->ctrl($name, $value, $typeCtrl) === true) {
+		if ($this->ctrl($name, $value, $typeCtrl)===true) {
 			return $name=$value;
 		}
 		return $this;
@@ -74,7 +74,7 @@ 
 	protected function addToMemberUnique(&$name, $value, $typeCtrl, $separator=" ") {
 		if (\is_array($typeCtrl)) {
 			$this->removeOldValues($name, $typeCtrl);
-			$name.=$separator . $value;
+			$name.=$separator.$value;
 		}
 		return $this;
 	}
@@ -82,17 +82,17 @@ 
 
 
 	protected function addToMemberCtrl(&$name, $value, $typeCtrl, $separator=" ") {
-		if ($this->ctrl($name, $value, $typeCtrl) === true) {
+		if ($this->ctrl($name, $value, $typeCtrl)===true) {
 			if (\is_array($typeCtrl)) {
 				$this->removeOldValues($name, $typeCtrl);
 			}
-			$name.=$separator . $value;
+			$name.=$separator.$value;
 		}
 		return $this;
 	}
 
 	protected function addToMember(&$name, $value, $separator=" ") {
-		$name=str_ireplace($value, "", $name) . $separator . $value;
+		$name=str_ireplace($value, "", $name).$separator.$value;
 		return $this;
 	}
 
@@ -103,18 +103,18 @@ 
 		$oldValue=trim($oldValue);
 	}
 
-	protected function _getElementBy($callback,$elements){
+	protected function _getElementBy($callback, $elements) {
 		if (\is_array($elements)) {
 			$elements=\array_values($elements);
 			$flag=false;
 			$index=0;
-			while ( !$flag && $index < sizeof($elements) ) {
+			while (!$flag && $index<sizeof($elements)) {
 				if ($elements[$index] instanceof BaseHtml)
 					$flag=($callback($elements[$index]));
 					$index++;
 			}
-			if ($flag === true)
-				return $elements[$index - 1];
+			if ($flag===true)
+				return $elements[$index-1];
 		} elseif ($elements instanceof BaseHtml) {
 			if ($callback($elements))
 				return $elements;
@@ -142,13 +142,13 @@ 
 	}
 
 	public function fromArray($array) {
-		foreach ( $this as $key => $value ) {
-			if(array_key_exists($key, $array)===true)
-				$this->_callSetter("set" . ucfirst($key), $key, $array[$key], $array);
+		foreach ($this as $key => $value) {
+			if (array_key_exists($key, $array)===true)
+				$this->_callSetter("set".ucfirst($key), $key, $array[$key], $array);
 		}
-		foreach ( $array as $key => $value ) {
-			if($this->_callSetter($key, $key, $value, $array)===false){
-				$this->_callSetter("set" . ucfirst($key), $key, $value, $array);
+		foreach ($array as $key => $value) {
+			if ($this->_callSetter($key, $key, $value, $array)===false) {
+				$this->_callSetter("set".ucfirst($key), $key, $value, $array);
 			}
 		}
 		return $array;
@@ -156,7 +156,7 @@ 
 
 	public function fromDatabaseObjects($objects, $function) {
 		if (isset($objects)) {
-			foreach ( $objects as $object ) {
+			foreach ($objects as $object) {
 				$this->fromDatabaseObject($object, $function);
 			}
 		}
@@ -177,7 +177,7 @@ 
 
 
 	public function getElementById($identifier, $elements) {
-		return $this->_getElementBy(function(BaseWidget $element) use ($identifier){return $element->getIdentifier()===$identifier;}, $elements);
+		return $this->_getElementBy(function(BaseWidget $element) use ($identifier){return $element->getIdentifier()===$identifier; }, $elements);
 	}
 
 	public function getBsComponent() {
@@ -190,14 +190,14 @@ 
 	}
 
 	protected function compile_once(JsUtils $js=NULL, &$view=NULL) {
-		if(!$this->_compiled){
-			if(isset($js)){
+		if (!$this->_compiled) {
+			if (isset($js)) {
 				$beforeCompile=$js->getParam("beforeCompileHtml");
-				if(\is_callable($beforeCompile)){
-					$beforeCompile($this,$js,$view);
+				if (\is_callable($beforeCompile)) {
+					$beforeCompile($this, $js, $view);
 				}
 			}
-			if(\is_callable($this->_preCompile)){
+			if (\is_callable($this->_preCompile)) {
 				$pc=$this->_preCompile;
 				$pc($this);
 			}
@@ -207,15 +207,15 @@ 
 	}
 
 	public function compile(JsUtils $js=NULL, &$view=NULL) {
-		$this->compile_once($js,$view);
+		$this->compile_once($js, $view);
 		$result=$this->getTemplate($js);
-		foreach ( $this as $key => $value ) {
-				if(\strstr($result, "%{$key}%")!==false){
+		foreach ($this as $key => $value) {
+				if (\strstr($result, "%{$key}%")!==false) {
 					if (\is_array($value)) {
 						$v=PropertyWrapper::wrap($value, $js);
-					}elseif($value instanceof \stdClass){
-							$v=\print_r($value,true);
-					}else{
+					}elseif ($value instanceof \stdClass) {
+							$v=\print_r($value, true);
+					} else {
 						$v=$value;
 					}
 					$result=str_replace("%{$key}%", $v, $result);
@@ -223,12 +223,12 @@ 
 		}
 		if (isset($js)===true) {
 			$this->run($js);
-			if (isset($view) === true) {
+			if (isset($view)===true) {
 				$js->addViewElement($this->_identifier, $result, $view);
 			}
 		}
 
-		if(\is_callable($this->_postCompile)){
+		if (\is_callable($this->_postCompile)) {
 			$pc=$this->_postCompile;
 			$pc($this);
 		}
@@ -239,11 +239,11 @@ 
 		return $this->compile();
 	}
 
-	public function onPostCompile($callback){
+	public function onPostCompile($callback) {
 		$this->_postCompile=$callback;
 	}
 
-	public function onPreCompile($callback){
+	public function onPreCompile($callback) {
 		$this->_preCompile=$callback;
 	}
 }

Braces +14 added lines, -10 removed lines

@@ -109,15 +109,18 @@ 
 			$flag=false;
 			$index=0;
 			while ( !$flag && $index < sizeof($elements) ) {
-				if ($elements[$index] instanceof BaseHtml)
-					$flag=($callback($elements[$index]));
+				if ($elements[$index] instanceof BaseHtml) {
+									$flag=($callback($elements[$index]));
+				}
 					$index++;
 			}
-			if ($flag === true)
-				return $elements[$index - 1];
+			if ($flag === true) {
+							return $elements[$index - 1];
+			}
 		} elseif ($elements instanceof BaseHtml) {
-			if ($callback($elements))
-				return $elements;
+			if ($callback($elements)) {
+							return $elements;
+			}
 		}
 		return null;
 	}
@@ -143,8 +146,9 @@ 
 
 	public function fromArray($array) {
 		foreach ( $this as $key => $value ) {
-			if(array_key_exists($key, $array)===true)
-				$this->_callSetter("set" . ucfirst($key), $key, $array[$key], $array);
+			if(array_key_exists($key, $array)===true) {
+							$this->_callSetter("set" . ucfirst($key), $key, $array[$key], $array);
+			}
 		}
 		foreach ( $array as $key => $value ) {
 			if($this->_callSetter($key, $key, $value, $array)===false){
@@ -213,9 +217,9 @@ 
 				if(\strstr($result, "%{$key}%")!==false){
 					if (\is_array($value)) {
 						$v=PropertyWrapper::wrap($value, $js);
-					}elseif($value instanceof \stdClass){
+					} elseif($value instanceof \stdClass){
 							$v=\print_r($value,true);
-					}else{
+					} else{
 						$v=$value;
 					}
 					$result=str_replace("%{$key}%", $v, $result);

Ajax/common/html/PropertyWrapper.php

Spacing +13 added lines, -13 removed lines

@@ -12,8 +12,8 @@ 
 		}
 		$output="";
 		if (\is_array($input)) {
-			if (sizeof($input) > 0) {
-				if (self::containsElement($input) === false) {
+			if (sizeof($input)>0) {
+				if (self::containsElement($input)===false) {
 					$output=self::wrapStrings($input, $separator=' ', $valueQuote='"');
 				} else {
 					$output=self::wrapObjects($input, $js, $separator, $valueQuote);
@@ -24,7 +24,7 @@ 
 	}
 
 	private static function containsElement($input) {
-		foreach ( $input as $v ) {
+		foreach ($input as $v) {
 			if (\is_object($v) || \is_array($v))
 				return true;
 		}
@@ -32,9 +32,9 @@ 
 	}
 
 	public static function wrapStrings($input, $separator=' ', $valueQuote='"') {
-		if (JArray::isAssociative($input) === true) {
-			$result=implode($separator, array_map(function ($v, $k) use($valueQuote) {
-				return $k . '=' . $valueQuote . $v . $valueQuote;
+		if (JArray::isAssociative($input)===true) {
+			$result=implode($separator, array_map(function($v, $k) use($valueQuote) {
+				return $k.'='.$valueQuote.$v.$valueQuote;
 			}, $input, array_keys($input)));
 		} else {
 			$result=implode($separator, $input);
@@ -43,17 +43,17 @@ 
 	}
 
 	public static function wrapObjects($input, $js=NULL, $separator=' ', $valueQuote='"') {
-		return implode($separator, array_map(function ($v) use($js, $separator, $valueQuote) {
-			if(\is_string($v)){
+		return implode($separator, array_map(function($v) use($js, $separator, $valueQuote) {
+			if (\is_string($v)) {
 				return $v;
 			}
-			if ($v instanceof BaseHtml){
+			if ($v instanceof BaseHtml) {
 				return $v->compile($js);
 			}
 			if (\is_array($v)) {
 				return self::wrap($v, $js, $separator, $valueQuote);
 			}
-			if(!\is_callable($v)){
+			if (!\is_callable($v)) {
 				return $v;
 			}
 		}, $input));
@@ -71,14 +71,14 @@ 
 		return $result;*/
 	}
 
-	protected static function wrapValue($value,$js=NULL, $separator=' ', $valueQuote='"'){
+	protected static function wrapValue($value, $js=NULL, $separator=' ', $valueQuote='"') {
 		if (\is_array($value)) {
 			return self::wrap($value, $js, $separator, $valueQuote);
 		}
-		if ($value instanceof BaseHtml){
+		if ($value instanceof BaseHtml) {
 			return $value->compile($js);
 		}
-		if(!\is_callable($value)){
+		if (!\is_callable($value)) {
 			return $value;
 		}
 		return '';

Braces +3 added lines, -2 removed lines

@@ -25,8 +25,9 @@
 
 	private static function containsElement($input) {
 		foreach ( $input as $v ) {
-			if (\is_object($v) || \is_array($v))
-				return true;
+			if (\is_object($v) || \is_array($v)) {
+							return true;
+			}
 		}
 		return false;
 	}

Ajax/common/traits/JsUtilsInternalTrait.php

Spacing +8 added lines, -8 removed lines

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

Braces +6 added lines, -3 removed lines

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

Ajax/semantic/html/content/table/HtmlTR.php

Braces +15 added lines, -10 removed lines

@@ -120,25 +120,29 @@ 
 	}
 
 	public function getColPosition($colIndex) {
-		if($this->_container->_isMerged()!==true)
-			return $colIndex;
+		if($this->_container->_isMerged()!==true) {
+					return $colIndex;
+		}
 		$pos=0;
 		$rows=$this->_container->getContent();
 		for($i=0; $i < $this->_row; $i++) {
 			$max=\min($colIndex, $rows[$i]->count());
 			for($j=0; $j < $max; $j++) {
 				$rowspan=$rows[$i]->getItem($j)->getRowspan();
-				if ($rowspan + $i > $this->_row)
-					$pos++;
+				if ($rowspan + $i > $this->_row) {
+									$pos++;
+				}
 			}
 		}
-		if ($pos > $colIndex)
-			return NULL;
+		if ($pos > $colIndex) {
+					return NULL;
+		}
 		$count=$this->count();
 		for($i=0; $i < $count; $i++) {
 			$pos+=$this->content[$i]->getColspan();
-			if ($pos >= $colIndex + 1)
-				return $i;
+			if ($pos >= $colIndex + 1) {
+							return $i;
+			}
 		}
 		return null;
 	}
@@ -161,8 +165,9 @@ 
 	public function containsStr($needle) {
 		$cells=$this->content;
 		foreach ( $cells as $cell ) {
-			if (\strpos($cell->getContent(), $needle) !== false)
-				return true;
+			if (\strpos($cell->getContent(), $needle) !== false) {
+							return true;
+			}
 		}
 		return false;
 	}

Spacing +21 added lines, -21 removed lines

@@ -20,19 +20,19 @@ 
 
 	public function __construct($identifier) {
 		parent::__construct($identifier, "tr", "");
-		$this->_states=[ State::ACTIVE,State::POSITIVE,State::NEGATIVE,State::WARNING,State::ERROR,State::DISABLED ];
+		$this->_states=[State::ACTIVE, State::POSITIVE, State::NEGATIVE, State::WARNING, State::ERROR, State::DISABLED];
 	}
 
 	public function setColCount($colCount) {
 		$count=$this->count();
-		for($i=$count; $i < $colCount; $i++) {
+		for ($i=$count; $i<$colCount; $i++) {
 			$item=$this->addItem(NULL);
 			$item->setTagName($this->_tdTagName);
 		}
 		return $this;
 	}
 
-	public function getColCount(){
+	public function getColCount() {
 		return $this->count();
 	}
 
@@ -68,7 +68,7 @@ 
 	 * @param mixed $values
 	 */
 	public function setValues($values=array()) {
-		return $this->_addOrSetValues($values, function(HtmlTD &$cell,$value){$cell->setValue($value);});
+		return $this->_addOrSetValues($values, function(HtmlTD &$cell, $value) {$cell->setValue($value); });
 	}
 
 	/**
@@ -76,27 +76,27 @@ 
 	 * @param mixed $values
 	 */
 	public function addValues($values=array()) {
-		return $this->_addOrSetValues($values, function(HtmlTD &$cell,$value){$cell->addValue($value);});
+		return $this->_addOrSetValues($values, function(HtmlTD &$cell, $value) {$cell->addValue($value); });
 	}
 
 	/**
 	 * Sets or adds values to the row cols
 	 * @param mixed $values
 	 */
-	protected function _addOrSetValues($values,$callback) {
+	protected function _addOrSetValues($values, $callback) {
 		$count=$this->count();
 		if (!\is_array($values)) {
 			$values=\array_fill(0, $count, $values);
 		} else {
-			if (JArray::isAssociative($values) === true) {
+			if (JArray::isAssociative($values)===true) {
 				$values=\array_values($values);
 			}
 		}
 		$count=\min(\sizeof($values), $count);
 
-		for($i=0; $i < $count; $i++) {
+		for ($i=0; $i<$count; $i++) {
 			$cell=$this->content[$i];
-			$callback($cell,$values[$i]);
+			$callback($cell, $values[$i]);
 		}
 		return $this;
 	}
@@ -120,24 +120,24 @@ 
 	}
 
 	public function getColPosition($colIndex) {
-		if($this->_container->_isMerged()!==true)
+		if ($this->_container->_isMerged()!==true)
 			return $colIndex;
 		$pos=0;
 		$rows=$this->_container->getContent();
-		for($i=0; $i < $this->_row; $i++) {
+		for ($i=0; $i<$this->_row; $i++) {
 			$max=\min($colIndex, $rows[$i]->count());
-			for($j=0; $j < $max; $j++) {
+			for ($j=0; $j<$max; $j++) {
 				$rowspan=$rows[$i]->getItem($j)->getRowspan();
-				if ($rowspan + $i > $this->_row)
+				if ($rowspan+$i>$this->_row)
 					$pos++;
 			}
 		}
-		if ($pos > $colIndex)
+		if ($pos>$colIndex)
 			return NULL;
 		$count=$this->count();
-		for($i=0; $i < $count; $i++) {
+		for ($i=0; $i<$count; $i++) {
 			$pos+=$this->content[$i]->getColspan();
-			if ($pos >= $colIndex + 1)
+			if ($pos>=$colIndex+1)
 				return $i;
 		}
 		return null;
@@ -145,7 +145,7 @@ 
 
 	public function conditionalCellFormat($callback, $format) {
 		$cells=$this->content;
-		foreach ( $cells as $cell ) {
+		foreach ($cells as $cell) {
 			$cell->conditionalCellFormat($callback, $format);
 		}
 		return $this;
@@ -160,8 +160,8 @@ 
 
 	public function containsStr($needle) {
 		$cells=$this->content;
-		foreach ( $cells as $cell ) {
-			if (\strpos($cell->getContent(), $needle) !== false)
+		foreach ($cells as $cell) {
+			if (\strpos($cell->getContent(), $needle)!==false)
 				return true;
 		}
 		return false;
@@ -174,13 +174,13 @@ 
 
 	public function applyCells($callback) {
 		$cells=$this->content;
-		foreach ( $cells as $cell ) {
+		foreach ($cells as $cell) {
 			$cell->apply($callback);
 		}
 		return $this;
 	}
 
-	public function toDelete($colIndex){
+	public function toDelete($colIndex) {
 		$this->getItem($colIndex)->toDelete();
 		return $this;
 	}