phpMv / phpMv-UI

Ajax/bootstrap/html/HtmlInputgroup.php

Spacing +6 added lines, -6 removed lines

@@ -70,14 +70,14 @@ 
 		$span->setTagName("div");
 		$buttons=array();
 		$i=1;
-		foreach ($items as $item){
+		foreach ($items as $item) {
 			$bt=NULL;
-			if(is_string($item)){
-				$bt=new HtmlButton($this->identifier."-bt-".$i++,$item);
-			}elseif ($item instanceof HtmlButton){
+			if (is_string($item)) {
+				$bt=new HtmlButton($this->identifier."-bt-".$i++, $item);
+			}elseif ($item instanceof HtmlButton) {
 				$bt=$item;
 			}
-			if(isset($bt)){
+			if (isset($bt)) {
 				$buttons[]=$bt;
 			}
 		}
@@ -119,7 +119,7 @@ 
 	 */
 	public function setSize($size) {
 		if (is_int($size)) {
-			return $this->addToMemberCtrl($this->mClass, CssRef::sizes("input-group")[$size],CssRef::sizes("input-group"));
+			return $this->addToMemberCtrl($this->mClass, CssRef::sizes("input-group")[$size], CssRef::sizes("input-group"));
 		}
 		return $this->addToMemberCtrl($this->mClass, $size, CssRef::sizes("input-group"));
 	}

Braces +17 added lines, -13 removed lines

@@ -28,10 +28,11 @@ 
 		$this->setProperty("aria-describedby", $id);
 		$span->setContent($text);
 		$span->setClass("input-group-addon");
-		if (strtolower($position)==="left")
-			$this->addonLeft=$span;
-		else
-			$this->addonRight=$span;
+		if (strtolower($position)==="left") {
+					$this->addonLeft=$span;
+		} else {
+					$this->addonRight=$span;
+		}
 		return $span;
 	}
 
@@ -74,7 +75,7 @@ 
 			$bt=NULL;
 			if(is_string($item)){
 				$bt=new HtmlButton($this->identifier."-bt-".$i++,$item);
-			}elseif ($item instanceof HtmlButton){
+			} elseif ($item instanceof HtmlButton){
 				$bt=$item;
 			}
 			if(isset($bt)){
@@ -88,10 +89,11 @@ 
 		$dropdown->setBtnCaption($caption);
 		$dropdown->fromArray($items);
 
-		if (strtolower($position)==="left")
-			$this->addonLeft=$dropdown;
-		else
-			$this->addonRight=$dropdown;
+		if (strtolower($position)==="left") {
+					$this->addonLeft=$dropdown;
+		} else {
+					$this->addonRight=$dropdown;
+		}
 		return $dropdown;
 	}
 
@@ -126,10 +128,12 @@ 
 
 	public function run(JsUtils $js) {
 		parent::run($js);
-		if (isset($this->addonLeft))
-			$this->addonLeft->run($js);
-		if (isset($this->addonRight))
-			$this->addonRight->run($js);
+		if (isset($this->addonLeft)) {
+					$this->addonLeft->run($js);
+		}
+		if (isset($this->addonRight)) {
+					$this->addonRight->run($js);
+		}
 	}
 
 }
\ No newline at end of file

Ajax/bootstrap/html/HtmlSplitbutton.php

Spacing +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
 	 */
 	public function run(JsUtils $js) {
 		if ($this->getProperty("role")==="nav") {
-			foreach ( $this->items as $dropdownItem ) {
+			foreach ($this->items as $dropdownItem) {
 				$dropdownItem->runNav($js);
 			}
 		}

Ajax/bootstrap/html/content/HtmlListgroupItem.php

Spacing +1 added lines, -1 removed lines

@@ -71,7 +71,7 @@
 		$element=new HtmlBsDoubleElement("", "p");
 		$element->setContent($content);
 		$element->setClass("list-group-item-text");
-		$this->element->setContent(array (
+		$this->element->setContent(array(
 				$elementHeader,
 				$element
 		));

Braces +3 added lines, -2 removed lines

@@ -40,8 +40,9 @@
 	 * @return \Ajax\bootstrap\html\HtmlListgroupItem default : "list-group-item-default"
 	 */
 	public function setStyle($cssStyle) {
-		if (!PhalconUtils::startsWith($cssStyle, "list-group-item"))
-			$cssStyle="list-group-item".$cssStyle;
+		if (!PhalconUtils::startsWith($cssStyle, "list-group-item")) {
+					$cssStyle="list-group-item".$cssStyle;
+		}
 		$this->element->addToPropertyCtrl("class", $cssStyle, CssRef::Styles("list-group-item"));
 		return $this->element;
 	}

Ajax/bootstrap/html/content/HtmlTabItem.php

Spacing +4 added lines, -4 removed lines

@@ -62,15 +62,15 @@
 	 */
 	public function setIdentifier($identifier) {
 		parent::setIdentifier($identifier);
-		if($this->content instanceof HtmlLink){
+		if ($this->content instanceof HtmlLink) {
 			$this->content->setIdentifier("link-".$identifier);
 		}
 	}
-	public function setActive($value=true){
-		$this->setProperty("class", ($value)?"active":"");
+	public function setActive($value=true) {
+		$this->setProperty("class", ($value) ? "active" : "");
 	}
 
-	public function disable(){
+	public function disable() {
 		$this->setProperty("class", "disabled");
 	}
 }
\ No newline at end of file

Ajax/bootstrap/html/content/HtmlNavzone.php

Spacing +7 added lines, -7 removed lines

@@ -27,7 +27,7 @@ 
 		parent::__construct($identifier);
 		$this->tagName="ul";
 		$this->_template='<%tagName% id="%identifier%" class="nav navbar-nav %class%">%elements%</%tagName%>';
-		$this->elements=array ();
+		$this->elements=array();
 	}
 
 	public function setClass($value) {
@@ -39,7 +39,7 @@ 
 	}
 
 	public function addElement($element) {
-		if($element instanceof HtmlLink){
+		if ($element instanceof HtmlLink) {
 			$this->addLink($element);
 		} else if (is_object($element)) {
 			$this->elements []=$element;
@@ -59,7 +59,7 @@ 
 
 	public function addElements($elements) {
 		if (is_array($elements)) {
-			foreach ( $elements as $key => $element ) {
+			foreach ($elements as $key => $element) {
 				$iid=$this->getElementsCount()+1;
 				if ($element instanceof HtmlDropdownItem)
 					$this->elements []=$element;
@@ -87,9 +87,9 @@ 
 	public function addLink($caption, $href="#") {
 		$iid=$this->getElementsCount()+1;
 		$li=new HtmlBsDoubleElement($this->identifier."-li-".$iid, "li");
-		if($caption instanceof HtmlLink){
+		if ($caption instanceof HtmlLink) {
 			$link=$caption;
-		}else{
+		} else {
 			$link=new HtmlLink($this->identifier."-link-".$iid, $href, $caption);
 		}
 		$li->setContent($link);
@@ -122,7 +122,7 @@ 
 	}
 
 	public function run(JsUtils $js) {
-		foreach ( $this->elements as $element ) {
+		foreach ($this->elements as $element) {
 			$element->run($js);
 		}
 	}
@@ -143,7 +143,7 @@ 
 	 * @param int $index
 	 * @return BaseHtml
 	 */
-	public function getElement($index){
+	public function getElement($index) {
 		return $this->elements[$index];
 	}
 }
\ No newline at end of file

Braces +4 added lines, -4 removed lines

@@ -61,9 +61,9 @@ 
 		if (is_array($elements)) {
 			foreach ( $elements as $key => $element ) {
 				$iid=$this->getElementsCount()+1;
-				if ($element instanceof HtmlDropdownItem)
-					$this->elements []=$element;
-				else if (is_array($element)) {
+				if ($element instanceof HtmlDropdownItem) {
+									$this->elements []=$element;
+				} else if (is_array($element)) {
 					if (is_string($key)===true) {
 						$dropdown=new HtmlDropdown($this->identifier."-dropdown-".$iid);
 						$dropdown->addItems($element);
@@ -89,7 +89,7 @@ 
 		$li=new HtmlBsDoubleElement($this->identifier."-li-".$iid, "li");
 		if($caption instanceof HtmlLink){
 			$link=$caption;
-		}else{
+		} else{
 			$link=new HtmlLink($this->identifier."-link-".$iid, $href, $caption);
 		}
 		$li->setContent($link);

Ajax/bootstrap/html/content/HtmlTabContent.php

Spacing +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
 	public function __construct($identifier, $tagName="div") {
 		parent::__construct($identifier, $tagName);
 		$this->setProperty("class", "tab-content");
-		$this->content=array (); // HtmlTabContentItem
+		$this->content=array(); // HtmlTabContentItem
 	}
 
 	public function addTabItem($identifier) {

Braces +3 added lines, -2 removed lines

@@ -23,8 +23,9 @@
 	}
 
 	public function getTabItem($index) {
-		if ($index<sizeof($this->content))
-			return $this->content [$index];
+		if ($index<sizeof($this->content)) {
+					return $this->content [$index];
+		}
 	}
 
 	public function getTabItems() {

Ajax/bootstrap/html/content/HtmlGridCol.php

Spacing +23 added lines, -23 removed lines

@@ -15,22 +15,22 @@ 
 class HtmlGridCol extends HtmlBsDoubleElement {
 	private $positions;
 	private $offsets;
-	public function __construct($identifier,$size=CssSize::SIZE_MD,$width=1){
-		parent::__construct($identifier,"div");
+	public function __construct($identifier, $size=CssSize::SIZE_MD, $width=1) {
+		parent::__construct($identifier, "div");
 		$this->positions=array();
 		$this->offsets=array();
-		$this->addPosition($size,$width);
+		$this->addPosition($size, $width);
 	}
-	public function addPosition($size=CssSize::SIZE_MD,$width=1){
+	public function addPosition($size=CssSize::SIZE_MD, $width=1) {
 		$this->positions[$size]=$width;
 		return $this;
 	}
-	private function _generateClass(){
+	private function _generateClass() {
 		$result=array();
-		foreach ($this->positions as $size=>$width){
+		foreach ($this->positions as $size=>$width) {
 			$result[]="col-".$size."-".$width;
 		}
-		foreach ($this->offsets as $size=>$offset){
+		foreach ($this->offsets as $size=>$offset) {
 			$result[]="col-".$size."-offset-".$offset;
 		}
 		return implode(" ", $result);
@@ -38,63 +38,63 @@ 
 
 	public function compile(JsUtils $js=NULL, &$view=NULL) {
 		$this->setProperty("class", $this->_generateClass());
-		return parent::compile($js,$view);
+		return parent::compile($js, $view);
 	}
 
-	public function setOffset($size,$offset){
+	public function setOffset($size, $offset) {
 		$this->offsets[$size]=$offset;
 		return $this;
 	}
 
-	public function setOffsetForAll($newOffset){
-		foreach ($this->offsets as &$value){
+	public function setOffsetForAll($newOffset) {
+		foreach ($this->offsets as &$value) {
 			$value=$newOffset;
 		}
 		unset($value);
 		return $this;
 	}
 
-	public function setWidthForAll($newWidth){
-		foreach ($this->positions as &$pos){
+	public function setWidthForAll($newWidth) {
+		foreach ($this->positions as &$pos) {
 			$pos=$newWidth;
 		}
 		unset($pos);
 		return $this;
 	}
 
-	public function setWidth($size=CssSize::SIZE_MD,$width=1){
+	public function setWidth($size=CssSize::SIZE_MD, $width=1) {
 		$this->positions[$size]=$width;
 		return $this;
 	}
 
-	public function setPosition($size=CssSize::SIZE_MD,$width=1){
-		return $this->addPosition($size,$width);
+	public function setPosition($size=CssSize::SIZE_MD, $width=1) {
+		return $this->addPosition($size, $width);
 	}
 
-	public function getWidth($size){
+	public function getWidth($size) {
 		return @$this->positions[$size];
 	}
 
-	public function getOffest($size){
+	public function getOffest($size) {
 		return @$this->offsets[$size];
 	}
 
-	public function addClear(){
-		$this->wrap("","<div class='clearfix'></div>");
+	public function addClear() {
+		$this->wrap("", "<div class='clearfix'></div>");
 	}
 	public function setOffsets($offsets) {
-		$this->offsets = $offsets;
+		$this->offsets=$offsets;
 		return $this;
 	}
 
-	public function copy($identifier){
+	public function copy($identifier) {
 		$result=new HtmlGridCol($identifier);
 		$result->setPositions($this->positions);
 		$result->setOffsets($this->offsets);
 		return $result;
 	}
 	public function setPositions($positions) {
-		$this->positions = $positions;
+		$this->positions=$positions;
 		return $this;
 	}
 	public function getOffsets() {

Ajax/bootstrap/html/HtmlAccordion.php

Indentation +8 added lines, -8 removed lines

@@ -50,14 +50,14 @@
 	}
 
 		/**
-	 * render the content of $controller::$action and set the response to a new panel
-	 * @param JsUtils $js
-	 * @param string $title The panel title
-	 * @param Controller $initialController
-	 * @param string $controller a Phalcon controller
-	 * @param string $action a Phalcon action
-	 * @param array $params
-	 */
+		 * render the content of $controller::$action and set the response to a new panel
+		 * @param JsUtils $js
+		 * @param string $title The panel title
+		 * @param Controller $initialController
+		 * @param string $controller a Phalcon controller
+		 * @param string $action a Phalcon action
+		 * @param array $params
+		 */
 	public function forwardPanel(JsUtils $js,$title,$initialController,$controller,$action,$params=array()){
 		return $this->addPanel($title, $js->forward($initialController, $controller, $action,$params));
 	}

Spacing +6 added lines, -6 removed lines

@@ -19,7 +19,7 @@ 
 		$this->setClass("panel-group");
 		$this->setRole("tablist");
 		$this->setProperty("aria-multiselectable", "true");
-		$this->content=array ();
+		$this->content=array();
 	}
 
 	public function addPanel($title, $content) {
@@ -45,8 +45,8 @@ 
 	 * @param string $viewName
 	 * @param $params The parameters to pass to the view
 	 */
-	public function renderViewPanel(JsUtils $js,$title,$initialController, $viewName, $params=array()) {
-		return $this->addPanel($title, $js->renderContent($initialController, $viewName,$params));
+	public function renderViewPanel(JsUtils $js, $title, $initialController, $viewName, $params=array()) {
+		return $this->addPanel($title, $js->renderContent($initialController, $viewName, $params));
 	}
 
 		/**
@@ -58,12 +58,12 @@ 
 	 * @param string $action a Phalcon action
 	 * @param array $params
 	 */
-	public function forwardPanel(JsUtils $js,$title,$initialController,$controller,$action,$params=array()){
-		return $this->addPanel($title, $js->forward($initialController, $controller, $action,$params));
+	public function forwardPanel(JsUtils $js, $title, $initialController, $controller, $action, $params=array()) {
+		return $this->addPanel($title, $js->forward($initialController, $controller, $action, $params));
 	}
 
 	public function run(JsUtils $js) {
-		foreach ( $this->content as $content ) {
+		foreach ($this->content as $content) {
 			$content->run($js);
 		}
 	}

Braces +3 added lines, -2 removed lines

@@ -69,7 +69,8 @@
 	}
 
 	public function getPanel($index) {
-		if ($index<sizeof($this->content))
-			return $this->content [$index];
+		if ($index<sizeof($this->content)) {
+					return $this->content [$index];
+		}
 	}
 }
\ No newline at end of file

Ajax/common/traits/JqueryAjaxTrait.php

Spacing +35 added lines, -35 removed lines

@@ -10,7 +10,7 @@ 
 	protected $ajaxLoader='<span></span><span></span><span></span><span></span><span></span>';
 
 	public abstract function _prep_value($value);
-	public abstract function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false,$immediatly=true);
+	public abstract function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false, $immediatly=true);
 	protected function addLoading(&$retour, $responseElement) {
 		$loading_notifier='<div class="ajax-loader">';
 		if ($this->ajaxLoader=='') {
@@ -23,20 +23,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";
@@ -46,22 +46,22 @@ 
 			return $retour;
 	}
 
-	protected function _getAjaxUrl($url,$attr){
+	protected function _getAjaxUrl($url, $attr) {
 		$url=$this->_correctAjaxUrl($url);
 		$retour="url='".$url."';\n";
 		$slash="/";
-		if(JString::endswith($url, "/")===true)
+		if (JString::endswith($url, "/")===true)
 			$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";
@@ -70,7 +70,7 @@ 
 		return $retour;
 	}
 
-	protected function _getResponseElement($responseElement){
+	protected function _getResponseElement($responseElement) {
 		if ($responseElement!=="") {
 			$responseElement=$this->_prep_value($responseElement);
 		}
@@ -80,7 +80,7 @@ 
 	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->jsUtils->getUrl($url);
 		}
 		return $url;
@@ -94,7 +94,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";
@@ -115,7 +115,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;
@@ -125,7 +125,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);
 	}
 
 	/**
@@ -137,19 +137,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";
@@ -164,26 +164,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";
@@ -210,7 +210,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;
@@ -218,7 +218,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);
 	}
 
 	/**
@@ -231,7 +231,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;
@@ -239,7 +239,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);
 	}
 
 	/**
@@ -252,7 +252,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;
@@ -261,6 +261,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

Braces +24 added lines, -17 removed lines

@@ -41,8 +41,9 @@ 
 		}
 		$retour.="$.".$method."(url,".$params.").done(function( data ) {\n";
 		$retour.=$this->_getOnAjaxDone($responseElement, $jsCallback)."});\n";
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$retour;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$retour;
+		}
 			return $retour;
 	}
 
@@ -50,13 +51,15 @@ 
 		$url=$this->_correctAjaxUrl($url);
 		$retour="url='".$url."';\n";
 		$slash="/";
-		if(JString::endswith($url, "/")===true)
-			$slash="";
+		if(JString::endswith($url, "/")===true) {
+					$slash="";
+		}
 		if(JString::isNotNull($attr)){
-			if ($attr=="value")
-				$retour.="url=url+'".$slash."'+$(this).val();\n";
-				else if($attr!=null && $attr!=="")
-					$retour.="url=url+'".$slash."'+($(this).attr('".$attr."')||'');\n";
+			if ($attr=="value") {
+							$retour.="url=url+'".$slash."'+$(this).val();\n";
+			} else if($attr!=null && $attr!=="") {
+									$retour.="url=url+'".$slash."'+($(this).attr('".$attr."')||'');\n";
+				}
 		}
 		return $retour;
 	}
@@ -78,8 +81,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->jsUtils->getUrl($url);
 		}
@@ -103,8 +107,9 @@ 
 				$retour.="\t".$jsCallback."\n".
 						"\t$(document).trigger('jsonReady',[data]);\n".
 						"});\n";
-				if ($immediatly)
-					$this->jquery_code_for_compile[]=$retour;
+				if ($immediatly) {
+									$this->jquery_code_for_compile[]=$retour;
+				}
 					return $retour;
 	}
 
@@ -143,7 +148,7 @@ 
 		if($context===null){
 			$appendTo="\t\tnewElm.appendTo($('".$maskSelector."').parent());\n";
 			$newElm = "$('#'+newId)";
-		}else{
+		} else{
 			$appendTo="\t\tnewElm.appendTo(".$context.");\n";
 			$newElm = $context.".find('#'+newId)";
 		}
@@ -153,8 +158,9 @@ 
 		$retour.="\t}\n"."\tfor(var key in value){\n"."\t\t\tvar html = $('<div />').append($(newElm).clone()).html();\n"."\t\t\tif(html.indexOf('[['+key+']]')>-1){\n"."\t\t\t\tcontent=$(html.split('[['+key+']]').join(value[key]));\n"."\t\t\t\t$(newElm).replaceWith(content);newElm=content;\n"."\t\t\t}\n"."\t\tvar sel='[data-id=\"'+key+'\"]';if($(sel,newElm).length){\n"."\t\t\tvar selElm=$(sel,newElm);\n"."\t\t\t if(selElm.is('[value]')) { selElm.attr('value',value[key]);selElm.val(value[key]);} else { selElm.html(value[key]); }\n"."\t\t}\n"."}\n"."\t$(newElm).show(true);"."\n"."\t$(newElm).removeClass('hide');"."});\n";
 		$retour.="\t$(document).trigger('jsonReady',[data]);\n";
 		$retour.="\t".$jsCallback."\n"."});\n";
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$retour;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$retour;
+		}
 			return $retour;
 	}
 	/**
@@ -195,8 +201,9 @@ 
 			}});\n";
 			$retour.="$('#".$form."').submit();\n";
 		}
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$retour;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$retour;
+		}
 			return $retour;
 	}