jcheron / phalcon-jquery

Ajax/Bootstrap.php

Spacing +11 added lines, -11 removed lines

@@ -269,8 +269,8 @@ 
 	 * @param string $tagName container tagName
 	 * @return HtmlListgroup
 	 */
-	public function htmlListgroup($identifier,$items=array(),$tagName="ul"){
-		$listGroup=new HtmlListgroup($identifier,$tagName);
+	public function htmlListgroup($identifier, $items=array(), $tagName="ul") {
+		$listGroup=new HtmlListgroup($identifier, $tagName);
 		$listGroup->addItems($items);
 		return $this->addHtmlComponent($listGroup);
 	}
@@ -295,8 +295,8 @@ 
 	 * @param string $onClick
 	 * @return HtmlSplitbutton
 	 */
-	public function htmlSplitbutton($identifier,$value="", $items=array(), $cssStyle="btn-default", $onClick=NULL) {
-		return $this->addHtmlComponent(new HtmlSplitbutton($identifier, $value, $items, $cssStyle,$onClick));
+	public function htmlSplitbutton($identifier, $value="", $items=array(), $cssStyle="btn-default", $onClick=NULL) {
+		return $this->addHtmlComponent(new HtmlSplitbutton($identifier, $value, $items, $cssStyle, $onClick));
 	}
 
 	/**
@@ -304,7 +304,7 @@ 
 	 * @param string $identifier
 	 * @return HtmlInputgroup
 	 */
-	public function htmlInputgroup($identifier){
+	public function htmlInputgroup($identifier) {
 		return $this->addHtmlComponent(new HtmlInputgroup($identifier));
 	}
 	
@@ -316,8 +316,8 @@ 
 	 * @param function $hrefFunction the function who generates the href elements. default : function($e){return $e->getContent()}
 	 * @return HtmlBreadcrumbs
 	 */
-	public function htmlBreadcrumbs($identifier,$elements=array(),$autoActive=true,$hrefFunction=NULL){
-		return $this->addHtmlComponent(new HtmlBreadcrumbs($identifier,$elements,$autoActive,$hrefFunction));
+	public function htmlBreadcrumbs($identifier, $elements=array(), $autoActive=true, $hrefFunction=NULL) {
+		return $this->addHtmlComponent(new HtmlBreadcrumbs($identifier, $elements, $autoActive, $hrefFunction));
 	}
 	
 	/**
@@ -329,8 +329,8 @@ 
 	 * @param int $active The active page
 	 * @return HtmlPagination
 	 */
-	public function htmlPagination($identifier,$from=1,$to=1,$active=NULL,$countVisible=NULL){
-		return $this->addHtmlComponent(new HtmlPagination($identifier,$from,$to,$active,$countVisible));
+	public function htmlPagination($identifier, $from=1, $to=1, $active=NULL, $countVisible=NULL) {
+		return $this->addHtmlComponent(new HtmlPagination($identifier, $from, $to, $active, $countVisible));
 	}
 	
 	/**
@@ -341,7 +341,7 @@ 
 	 * @param int $numCols
 	 * @return HtmlGridSystem
 	 */
-	public function htmlGridSystem($identifier,$numRows=1,$numCols=NULL){
-		return $this->addHtmlComponent(new HtmlGridSystem($identifier,$numRows,$numCols));
+	public function htmlGridSystem($identifier, $numRows=1, $numCols=NULL) {
+		return $this->addHtmlComponent(new HtmlGridSystem($identifier, $numRows, $numCols));
 	}
 }
\ No newline at end of file

Ajax/bootstrap/html/HtmlGridsystem.php

Spacing +22 added lines, -22 removed lines

@@ -16,11 +16,11 @@ 
 class HtmlGridSystem extends HtmlDoubleElement {
 	private $rows;
 	
-	public function __construct($identifier,$numRows=1,$numCols=NULL){
-		parent::__construct($identifier,"div");
+	public function __construct($identifier, $numRows=1, $numCols=NULL) {
+		parent::__construct($identifier, "div");
 		$this->setProperty("class", "container-fluid");
 		$this->rows=array();
-		$this->setNumRows($numRows,$numCols);
+		$this->setNumRows($numRows, $numCols);
 	}
 	
 	/**
@@ -28,8 +28,8 @@ 
 	 * @param int $numCols 
 	 * @return \Ajax\bootstrap\html\content\HtmlGridRow
 	 */
-	public function addRow($numCols=NULL){
-		$row=new HtmlGridRow($this->identifier."-row-".(sizeof($this->rows)+1),$numCols);
+	public function addRow($numCols=NULL) {
+		$row=new HtmlGridRow($this->identifier."-row-".(sizeof($this->rows)+1), $numCols);
 		$this->rows[]=$row;
 		return $row;
 	}
@@ -40,10 +40,10 @@ 
 	 * @param boolean $force add the row at $index if true
 	 * @return \Ajax\bootstrap\html\content\HtmlGridRow
 	 */
-	public function getRow($index,$force=true){
-		if($index<sizeof($this->rows)){
+	public function getRow($index, $force=true) {
+		if ($index<sizeof($this->rows)) {
 			$result=$this->rows[$index-1];
-		}else if ($force){
+		}else if ($force) {
 			$this->setNumRows($index);
 			$result=$this->rows[$index-1];
 		}
@@ -56,8 +56,8 @@ 
 	 * @param int $numCols
 	 * @return \Ajax\bootstrap\html\HtmlGridSystem
 	 */
-	public function setNumRows($numRows,$numCols=NULL){
-		for($i=sizeof($this->rows);$i<$numRows;$i++){
+	public function setNumRows($numRows, $numCols=NULL) {
+		for ($i=sizeof($this->rows); $i<$numRows; $i++) {
 			$this->addRow($numCols);
 		}
 		return $this;
@@ -69,10 +69,10 @@ 
 	 * @param $force add the cell at $row,$col if true
 	 * @return HtmlGridCol
 	 */
-	public function getCell($row,$col,$force=true){
-		$row=$this->getRow($row,$force);
-		if(isset($row)){
-			$col=$row->getCol($col,$force);
+	public function getCell($row, $col, $force=true) {
+		$row=$this->getRow($row, $force);
+		if (isset($row)) {
+			$col=$row->getCol($col, $force);
 		}
 		return $col;
 	}
@@ -82,22 +82,22 @@ 
 	 * @param int $col
 	 * @return HtmlGridCol
 	 */
-	public function getCellAt($row,$col,$force=true){
-		$row=$this->getRow($row,$force);
-		if(isset($row)){
-			$col=$row->getColAt($col,$force);
+	public function getCellAt($row, $col, $force=true) {
+		$row=$this->getRow($row, $force);
+		if (isset($row)) {
+			$col=$row->getColAt($col, $force);
 		}
 		return $col;
 	}
 	
 	public function compile(JsUtils $js=NULL, View $view=NULL) {
-		foreach ($this->rows as $row){
+		foreach ($this->rows as $row) {
 			$this->addContent($row);
 		}
-		return parent::compile($js,$view);
+		return parent::compile($js, $view);
 	}
-	public function setContentForAll($content){
-		foreach ($this->rows as $row){
+	public function setContentForAll($content) {
+		foreach ($this->rows as $row) {
 			$row->setContentForAll($content);
 		}
 	}

Ajax/bootstrap/html/content/HtmlGridCol.php

Spacing +23 added lines, -23 removed lines

@@ -15,22 +15,22 @@ 
 class HtmlGridCol extends HtmlDoubleElement {
 	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 $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/content/HtmlGridRow.php

Spacing +38 added lines, -38 removed lines

@@ -14,88 +14,88 @@
  */
 class HtmlGridRow extends HtmlDoubleElement {
 	private $cols;
-	public function __construct($identifier,$numCols=NULL){
-		parent::__construct($identifier,"div");
+	public function __construct($identifier, $numCols=NULL) {
+		parent::__construct($identifier, "div");
 		$this->setProperty("class", "row");
 		$this->cols=array();
-		if(isset($numCols)){
-			$numCols=min(12,$numCols);
-			$numCols=max(1,$numCols);
-			$width=12/$numCols;
-			for ($i=0;$i<$numCols;$i++){
-				$this->addCol(CssSize::SIZE_MD,$width);
+		if (isset($numCols)) {
+			$numCols=min(12, $numCols);
+			$numCols=max(1, $numCols);
+			$width=12 / $numCols;
+			for ($i=0; $i<$numCols; $i++) {
+				$this->addCol(CssSize::SIZE_MD, $width);
 			}
 		}
 	}
 	
-	public function addCol($size=CssSize::SIZE_MD,$width=1){
-		$col=new HtmlGridCol($this->identifier."-col-".(sizeof($this->cols)+1),$size,$width);
+	public function addCol($size=CssSize::SIZE_MD, $width=1) {
+		$col=new HtmlGridCol($this->identifier."-col-".(sizeof($this->cols)+1), $size, $width);
 		$this->cols[]=$col;
 		return $col;
 	}
 	
-	public function addColAt($size=CssSize::SIZE_MD,$width=1,$offset=1){
-		$col=$this->addCol($size,$width);
-		return $col->setOffset($size, max($offset,sizeof($this->cols)+1));
+	public function addColAt($size=CssSize::SIZE_MD, $width=1, $offset=1) {
+		$col=$this->addCol($size, $width);
+		return $col->setOffset($size, max($offset, sizeof($this->cols)+1));
 	}
 	
-	public function getCol($index,$force=true){
-		if($index<sizeof($this->cols)+1){
+	public function getCol($index, $force=true) {
+		if ($index<sizeof($this->cols)+1) {
 			$result=$this->cols[$index-1];
-		}else if ($force){
-			$result=$this->addColAt(CssSize::SIZE_MD,1,$index);
+		}else if ($force) {
+			$result=$this->addColAt(CssSize::SIZE_MD, 1, $index);
 		}
 		return $result;
 	}
 	
-	public function getColAt($offset,$force=true){
+	public function getColAt($offset, $force=true) {
 		$result=null;
-		foreach ($this->cols as $col){
+		foreach ($this->cols as $col) {
 			$offsets=$col->getOffsets();
-			if($result=array_search($offset, $offsets)){
+			if ($result=array_search($offset, $offsets)) {
 				break;
 			}
 		}
-		if(!$result || isset($result)==false){
-			$result=$this->getCol($offset,$force);
+		if (!$result || isset($result)==false) {
+			$result=$this->getCol($offset, $force);
 		}
 		return $result;
 	}
 	
 	public function compile(JsUtils $js=NULL, View $view=NULL) {
 	
-		foreach ($this->cols as $col){
+		foreach ($this->cols as $col) {
 			$this->addContent($col);
 		}
-		return parent::compile($js,$view);
+		return parent::compile($js, $view);
 	}
 	public function getCols() {
 		return $this->cols;
 	}
 	
-	public function setContentForAll($content){
-		foreach ($this->cols as $col){
+	public function setContentForAll($content) {
+		foreach ($this->cols as $col) {
 			$col->setContent($content);
 		}
 	}
-	public function merge($size=CssSize::SIZE_MD,$start,$width){
-		$col=$this->getColAt($start,false);
-		if(isset($col)){
-			$col->setWidth($size,$width+1);
-			$this->delete($size,$start+1, $width);
+	public function merge($size=CssSize::SIZE_MD, $start, $width) {
+		$col=$this->getColAt($start, false);
+		if (isset($col)) {
+			$col->setWidth($size, $width+1);
+			$this->delete($size, $start+1, $width);
 		}
 	}
-	public function delete($size=CssSize::SIZE_MD,$start,$width){
-		while($start<sizeof($this->cols)+1 && $width>0){
-			$col=$this->getColAt($start,false);
-			if(isset($col)){
+	public function delete($size=CssSize::SIZE_MD, $start, $width) {
+		while ($start<sizeof($this->cols)+1 && $width>0) {
+			$col=$this->getColAt($start, false);
+			if (isset($col)) {
 				$widthCol=$col->getWidth($size);
-				if($widthCol<=$width){
+				if ($widthCol<=$width) {
 					unset($this->cols[$start-1]);
-					$this->cols = array_values($this->cols);
+					$this->cols=array_values($this->cols);
 					$width=$width-$widthCol;
 				}
-			}else{
+			}else {
 				$width=0;
 			}
 		}

Ajax/JsUtils.php

Spacing +58 added lines, -58 removed lines

@@ -45,7 +45,7 @@ 
 
 	protected function _setDi($di) {
 		$this->_di=$di;
-		if ($this->js!=null&&$di!=null)
+		if ($this->js!=null && $di!=null)
 			$this->js->setDi($di);
 	}
 
@@ -120,17 +120,17 @@ 
 	}
 
 	public function __construct($params=array()) {
-		$defaults=array (
+		$defaults=array(
 				'driver' => 'Jquery'
 		);
-		foreach ( $defaults as $key => $val ) {
-			if (isset($params[$key])&&$params[$key]!=="") {
+		foreach ($defaults as $key => $val) {
+			if (isset($params[$key]) && $params[$key]!=="") {
 				$defaults[$key]=$params[$key];
 			}
 		}
 		extract($defaults);
 		$this->js=new Jquery();
-		$this->cdns=array ();
+		$this->cdns=array();
 	}
 
 	public function addToCompile($jsScript) {
@@ -382,7 +382,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);
 	}
 	
 	/**
@@ -392,8 +392,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);
 	}
 	
 	/**
@@ -403,8 +403,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);
 	}
 	
 	/**
@@ -424,8 +424,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);
 	}
 
 	/**
@@ -435,7 +435,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);
 	}
 	// --------------------------------------------------------------------
 	/**
@@ -460,7 +460,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);
 	}
 
 	/**
@@ -471,7 +471,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);
 	}
 	// --------------------------------------------------------------------
 	/**
@@ -522,7 +522,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);
 	}
 	// --------------------------------------------------------------------
 	/**
@@ -583,7 +583,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);
 	}
 
 	/**
@@ -630,7 +630,7 @@ 
 	 */
 	public function compile($view=NULL, $view_var='script_foot', $script_tags=TRUE) {
 		$bs=$this->_bootstrap;
-		if (isset($bs)&&isset($view)) {
+		if (isset($bs) && isset($view)) {
 			$bs->compileHtml($this, $view);
 		}
 		return $this->js->_compile($view, $view_var, $script_tags);
@@ -710,27 +710,27 @@ 
 				$json_result=$result->result_array();
 			} elseif (is_array($result)) {
 				$json_result=$result;
-			} else {
+			}else {
 				return $this->_prep_args($result);
 			}
-		} else {
+		}else {
 			return 'null';
 		}
 		return $this->_create_json($json_result, $match_array_type);
 	}
 
 	private function _create_json($json_result, $match_array_type) {
-		$json=array ();
+		$json=array();
 		$_is_assoc=TRUE;
-		if (!is_array($json_result)&&empty($json_result)) {
+		if (!is_array($json_result) && empty($json_result)) {
 			show_error("Generate JSON Failed - Illegal key, value pair.");
 		} elseif ($match_array_type) {
 			$_is_assoc=$this->_is_associative_array($json_result);
 		}
-		foreach ( $json_result as $k => $v ) {
+		foreach ($json_result as $k => $v) {
 			if ($_is_assoc) {
 				$json[]=$this->_prep_args($k, TRUE).':'.$this->generate_json($v, $match_array_type);
-			} else {
+			}else {
 				$json[]=$this->generate_json($v, $match_array_type);
 			}
 		}
@@ -745,7 +745,7 @@ 
 	 * @return type
 	 */
 	public function _is_associative_array($arr) {
-		foreach ( array_keys($arr) as $key => $val ) {
+		foreach (array_keys($arr) as $key => $val) {
 			if ($key!==$val) {
 				return TRUE;
 			}
@@ -764,11 +764,11 @@ 
 			return 'null';
 		} elseif (is_bool($result)) {
 			return ($result===TRUE) ? 'true' : 'false';
-		} elseif (is_string($result)||$is_key) {
-			return '"'.str_replace(array (
-					'\\',"\t","\n","\r",'"','/'
-			), array (
-					'\\\\','\\t','\\n',"\\r",'\"','\/'
+		} elseif (is_string($result) || $is_key) {
+			return '"'.str_replace(array(
+					'\\', "\t", "\n", "\r", '"', '/'
+			), array(
+					'\\\\', '\\t', '\\n', "\\r", '\"', '\/'
 			), $result).'"';
 		} elseif (is_scalar($result)) {
 			return $result;
@@ -783,8 +783,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);
 	}
 
 	/**
@@ -795,8 +795,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);
 	}
 
 	/**
@@ -806,8 +806,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);
 	}
 	
 	/**
@@ -851,8 +851,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);
 	}
 
 	/**
@@ -864,7 +864,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);
 	}
 
@@ -902,8 +902,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);
 	}
 
 	/**
@@ -916,8 +916,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);
 	}
 
 	/**
@@ -931,7 +931,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);
 	}
 
 	/**
@@ -955,8 +955,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);
 	}
 
 	/**
@@ -969,8 +969,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);
 	}
 
 	/**
@@ -984,7 +984,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);
 	}
 
 	/**
@@ -1039,7 +1039,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);
 	}
 
 	/**
@@ -1066,7 +1066,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;
 	}
 
@@ -1076,7 +1076,7 @@ 
 
 	public function setCDNs($cdns) {
 		if (is_array($cdns)===false) {
-			$cdns=array (
+			$cdns=array(
 					$cdns
 			);
 		}
@@ -1087,9 +1087,9 @@ 
 		$hasJQuery=false;
 		$hasJQueryUI=false;
 		$hasBootstrap=false;
-		$result=array ();
-		foreach ( $this->cdns as $cdn ) {
-			switch(get_class($cdn)) {
+		$result=array();
+		foreach ($this->cdns as $cdn) {
+			switch (get_class($cdn)) {
 				case "Ajax\lib\CDNJQuery":
 					$hasJQuery=true;
 					$result[0]=$cdn;
@@ -1107,10 +1107,10 @@ 
 		if ($hasJQuery===false) {
 			$result[0]=new CDNJQuery("x");
 		}
-		if ($hasJQueryUI===false&&isset($this->_ui)) {
+		if ($hasJQueryUI===false && isset($this->_ui)) {
 			$result[1]=new CDNGuiGen("x", $template);
 		}
-		if ($hasBootstrap===false&&isset($this->_bootstrap)) {
+		if ($hasBootstrap===false && isset($this->_bootstrap)) {
 			$result[2]=new CDNBootstrap("x");
 		}
 		ksort($result);
@@ -1124,7 +1124,7 @@ 
 			$this->_setDi($di);
 		}
 	}
-} else {
+}else {
 	class JsUtils extends _JsUtils {
 
 		public function setDi(DiInterface $di) {

Ajax/bootstrap/html/base/HtmlSingleElement.php

Spacing +2 added lines, -2 removed lines

@@ -13,7 +13,7 @@ 
 	}
 
 	public function setClass($classNames) {
-		if(is_array($classNames)){
+		if (is_array($classNames)) {
 			$classNames=implode(" ", $classNames);
 		}
 		$this->setProperty("class", $classNames);
@@ -40,7 +40,7 @@ 
 	 */
 	public function fromArray($array) {
 		$array=parent::fromArray($array);
-		foreach ( $array as $key => $value ) {
+		foreach ($array as $key => $value) {
 			$this->setProperty($key, $value);
 		}
 		return $array;

Ajax/bootstrap/html/html5/HtmlSelect.php

Spacing +16 added lines, -16 removed lines

@@ -16,7 +16,7 @@ 
 	private $default;
 	private $options;
 
-	public function __construct($identifier, $caption,$default=NULL) {
+	public function __construct($identifier, $caption, $default=NULL) {
 		parent::__construct($identifier, "select");
 		$this->setProperty("name", $identifier);
 		$this->setProperty("class", "form-control");
@@ -25,21 +25,21 @@ 
 		$this->options=array();
 	}
 
-	public function addOption($element,$value="",$selected=false){
-		if($element instanceof HtmlOption){
+	public function addOption($element, $value="", $selected=false) {
+		if ($element instanceof HtmlOption) {
 			$option=$element;
-		}else{
-			$option=new HtmlOption($this->identifier."-".count($this->options), $element,$value);
+		}else {
+			$option=new HtmlOption($this->identifier."-".count($this->options), $element, $value);
 		}
-		if($selected || $option->getValue()==$this->getProperty("value")){
+		if ($selected || $option->getValue()==$this->getProperty("value")) {
 			$option->select();
 		}
 		$this->options[]=$option;
 	}
 
 	public function setValue($value) {
-		foreach ( $this->options as $option ) {
-			if (strcasecmp($option->getValue(),$value)===0) {
+		foreach ($this->options as $option) {
+			if (strcasecmp($option->getValue(), $value)===0) {
 				$option->setProperty("selected", "");
 			}
 		}
@@ -52,23 +52,23 @@ 
 	 */
 	public function compile(JsUtils $js=NULL, View $view=NULL) {
 		$this->content=array();
-		if(isset($this->default)){
+		if (isset($this->default)) {
 			$default=new HtmlOption("", $this->default);
 			$this->content[]=$default;
 		}
-		foreach ($this->options as $option){
+		foreach ($this->options as $option) {
 			$this->content[]=$option;
 		}
 		return parent::compile($js, $view);
 	}
 
-	public function fromArray($array){
-		if(JArray::isAssociative($array)){
-			foreach ($array as $k=>$v){
+	public function fromArray($array) {
+		if (JArray::isAssociative($array)) {
+			foreach ($array as $k=>$v) {
 				$this->addOption($v, $k);
 			}
-		}else{
-			foreach ($array as $v){
+		}else {
+			foreach ($array as $v) {
 				$this->addOption($v, $v);
 			}
 		}
@@ -101,7 +101,7 @@ 
 		$this->addOption($function($object));
 	}
 
-	public function setSize($size){
+	public function setSize($size) {
 		return $this->setProperty("size", $size);
 	}
 }

Ajax/Jquery.php

Spacing +68 added lines, -68 removed lines

@@ -21,14 +21,14 @@ 
 	protected $_bootstrap;
 	protected $libraryFile;
 	protected $_javascript_folder='js';
-	protected $jquery_code_for_load=array ();
-	protected $jquery_code_for_compile=array ();
+	protected $jquery_code_for_load=array();
+	protected $jquery_code_for_compile=array();
 	protected $jquery_corner_active=FALSE;
 	protected $jquery_table_sorter_active=FALSE;
 	protected $jquery_table_sorter_pager_active=FALSE;
 	protected $ajaxLoader='<span></span><span></span><span></span><span></span><span></span>';
-	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"
 	);
 
 	public function setDi($di) {
@@ -51,7 +51,7 @@ 
 
 	public function __construct($params) {
 		$this->params=array();
-		foreach ( $params as $key => $val ) {
+		foreach ($params as $key => $val) {
 				$this->params[$key]=$params[$key];
 		}
 	}
@@ -165,7 +165,7 @@ 
 	 */
 	public function _click($element='this', $js=array(), $ret_false=TRUE) {
 		if (!is_array($js)) {
-			$js=array (
+			$js=array(
 					$js
 			);
 		}
@@ -360,12 +360,12 @@ 
 	 */
 	public function _output($array_js='') {
 		if (!is_array($array_js)) {
-			$array_js=array (
+			$array_js=array(
 					$array_js
 			);
 		}
 
-		foreach ( $array_js as $js ) {
+		foreach ($array_js as $js) {
 			$this->jquery_code_for_compile[]="\t$js\n";
 		}
 	}
@@ -420,7 +420,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});";
@@ -441,7 +441,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;
@@ -455,12 +455,12 @@ 
 	 * @param string $param
 	 * @param boolean $immediatly delayed if false
 	 */
-	public function _genericCallValue($jQueryCall,$element='this', $param="", $immediatly=false) {
+	public function _genericCallValue($jQueryCall, $element='this', $param="", $immediatly=false) {
 		$element=$this->_prep_element($element);
 		if (isset($param)) {
 			$param=$this->_prep_value($param);
 			$str="$({$element}).{$jQueryCall}({$param});";
-		} else
+		}else
 			$str="$({$element}).{$jQueryCall}();";
 			if ($immediatly)
 				$this->jquery_code_for_compile[]=$str;
@@ -474,7 +474,7 @@ 
 	 * @param boolean $immediatly delayed if false
 	 * @return string
 	 */
-	public function _genericCallElement($jQueryCall,$to='this', $element, $immediatly=false) {
+	public function _genericCallElement($jQueryCall, $to='this', $element, $immediatly=false) {
 		$to=$this->_prep_element($to);
 		$element=$this->_prep_element($element);
 		$str="$({$to}).{$jQueryCall}({$element});";
@@ -500,7 +500,7 @@ 
 
 		$animations="\t\t\t";
 		if (is_array($params)) {
-			foreach ( $params as $param => $value ) {
+			foreach ($params as $param => $value) {
 				$animations.=$param.': \''.$value.'\', ';
 			}
 		}
@@ -772,12 +772,12 @@ 
 	 */
 	public function sortable($element, $options=array()) {
 		if (count($options)>0) {
-			$sort_options=array ();
-			foreach ( $options as $k => $v ) {
+			$sort_options=array();
+			foreach ($options as $k => $v) {
 				$sort_options[]="\n\t\t".$k.': '.$v."";
 			}
 			$sort_options=implode(",", $sort_options);
-		} else {
+		}else {
 			$sort_options='';
 		}
 
@@ -811,7 +811,7 @@ 
 	 * @param boolean $stopPropagation Prevents the event from bubbling up the DOM tree, preventing any parent handlers from being notified of the event.
 	 * @return string
 	 */
-	public function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false,$immediatly=true) {
+	public function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false, $immediatly=true) {
 		if (is_array($js)) {
 			$js=implode("\n\t\t", $js);
 		}
@@ -825,7 +825,7 @@ 
 			$event="\n\t$(".$this->_prep_element($element).").bind('{$event}',function(event){\n\t\t{$js}\n\t});\n";
 		else
 			$event="\n\t$(".$this->_prep_element($element).").{$event}(function(event){\n\t\t{$js}\n\t});\n";
-		if($immediatly)
+		if ($immediatly)
 			$this->jquery_code_for_compile[]=$event;
 		return $event;
 	}
@@ -859,7 +859,7 @@ 
 
 		// External references
 		$external_scripts=implode('', $this->jquery_code_for_load);
-		extract(array (
+		extract(array(
 				'library_src' => $external_scripts
 		));
 
@@ -874,7 +874,7 @@ 
 		$script.='});';
 
 		$this->jquery_code_for_compile=array();
-		if($this->params["debug"]==false){
+		if ($this->params["debug"]==false) {
 			$script=$this->minify($script);
 		}
 		$output=($script_tags===FALSE) ? $script : $this->inline($script);
@@ -896,7 +896,7 @@ 
 	 * @return void
 	 */
 	public function _clear_compile() {
-		$this->jquery_code_for_compile=array ();
+		$this->jquery_code_for_compile=array();
 	}
 
 	// --------------------------------------------------------------------
@@ -908,12 +908,12 @@ 
 	 */
 	public function _document_ready($js) {
 		if (!is_array($js)) {
-			$js=array (
+			$js=array(
 					$js
 			);
 		}
 
-		foreach ( $js as $script ) {
+		foreach ($js as $script) {
 			$this->jquery_code_for_compile[]=$script;
 		}
 	}
@@ -929,7 +929,7 @@ 
 	 * @return string
 	 */
 	public function _prep_element($element) {
-		if (strrpos($element, 'this')===false&&strrpos($element, 'event')===false&&strrpos($element, 'self')===false) {
+		if (strrpos($element, 'this')===false && strrpos($element, 'event')===false && strrpos($element, 'self')===false) {
 			$element='"'.addslashes($element).'"';
 		}
 		return $element;
@@ -947,7 +947,7 @@ 
 		if (is_array($value)) {
 			$value=implode(",", $value);
 		}
-		if (strrpos($value, 'this')===false&&strrpos($value, 'event')===false&&strrpos($value, 'self')===false) {
+		if (strrpos($value, 'this')===false && strrpos($value, 'event')===false && strrpos($value, 'self')===false) {
 			$value='"'.$value.'"';
 		}
 		return $value;
@@ -962,8 +962,8 @@ 
 	 * @return string
 	 */
 	private function _validate_speed($speed) {
-		if (in_array($speed, array (
-				'slow','normal','fast'
+		if (in_array($speed, array(
+				'slow', 'normal', 'fast'
 		))) {
 			$speed='"'.$speed.'"';
 		} elseif (preg_match("/[^0-9]/", $speed)) {
@@ -977,7 +977,7 @@ 
 		$loading_notifier='<div class="ajax-loader">';
 		if ($this->ajaxLoader=='') {
 			$loading_notifier.="Loading...";
-		} else {
+		}else {
 			$loading_notifier.=$this->ajaxLoader;
 		}
 		$loading_notifier.='</div>';
@@ -985,20 +985,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";
@@ -1008,22 +1008,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";
@@ -1032,7 +1032,7 @@ 
 		return $retour;
 	}
 
-	protected function _getResponseElement($responseElement){
+	protected function _getResponseElement($responseElement) {
 		if ($responseElement!=="") {
 			$responseElement=$this->_prep_value($responseElement);
 		}
@@ -1042,7 +1042,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;
@@ -1056,7 +1056,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";
@@ -1077,7 +1077,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;
@@ -1087,7 +1087,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);
 	}
 
 	/**
@@ -1099,19 +1099,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";
@@ -1126,26 +1126,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";
@@ -1172,7 +1172,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;
@@ -1180,7 +1180,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);
 	}
 
 	/**
@@ -1193,7 +1193,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;
@@ -1201,7 +1201,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);
 	}
 
 	/**
@@ -1214,7 +1214,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;
@@ -1223,7 +1223,7 @@ 
 		$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);
 	}
 
 	/**
@@ -1259,8 +1259,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);
 	}
 
 	/**
@@ -1286,12 +1286,12 @@ 
 	 * @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);
 	}
 
 	private function minify($input) {
-	if(trim($input) === "") return $input;
+	if (trim($input)==="") return $input;
 	return preg_replace(
 			array(
 					// Remove comment(s)