jcheron / phalcon-jquery

Ajax/bootstrap/html/content/HtmlGridRow.php

Doc Comments +10 added lines

@@ -14,6 +14,11 @@ 
  */
 class HtmlGridRow extends HtmlDoubleElement {
 	private $cols;
+
+	/**
+	 * @param string $identifier
+	 * @param integer $numCols
+	 */
 	public function __construct($identifier,$numCols=NULL){
 		parent::__construct($identifier,"div");
 		$this->setProperty("class", "row");
@@ -85,6 +90,11 @@ 
 			$this->delete($size,$start+1, $width);
 		}
 	}
+
+	/**
+	 * @param integer $start
+	 * @param integer $width
+	 */
 	public function delete($size=CssSize::SIZE_MD,$start,$width){
 		while($start<sizeof($this->cols)+1 && $width>0){
 			$col=$this->getColAt($start,false);

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;
 			}
 		}

Braces +2 added lines, -2 removed lines

@@ -42,7 +42,7 @@ 
 	public function getCol($index,$force=true){
 		if($index<sizeof($this->cols)+1){
 			$result=$this->cols[$index-1];
-		}else if ($force){
+		} else if ($force){
 			$result=$this->addColAt(CssSize::SIZE_MD,1,$index);
 		}
 		return $result;
@@ -95,7 +95,7 @@ 
 					$this->cols = array_values($this->cols);
 					$width=$width-$widthCol;
 				}
-			}else{
+			} else{
 				$width=0;
 			}
 		}

Ajax/bootstrap/html/HtmlGridsystem.php

Doc Comments +4 added lines

@@ -16,6 +16,10 @@
 class HtmlGridSystem extends HtmlDoubleElement {
 	private $rows;
 	
+	/**
+	 * @param string $identifier
+	 * @param integer $numCols
+	 */
 	public function __construct($identifier,$numRows=1,$numCols=NULL){
 		parent::__construct($identifier,"div");
 		$this->setProperty("class", "container-fluid");

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);
 		}
 	}

Braces +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
 	public function getCol($index,$force=true){
 		if($index<sizeof($this->cols)+1){
 			$result=$this->cols[$index-1];
-		}else if ($force){
+		} else if ($force){
 			$result=$this->addColAt(CssSize::SIZE_MD,1,$index);
 			$this->cols[]=$result;
 		}

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/Jquery.php

Doc Comments +35 added lines, -4 removed lines

@@ -159,7 +159,7 @@ 
 	 * Outputs a jQuery click event
 	 *
 	 * @param string $element The element to attach the event to
-	 * @param mixed $js The code to execute
+	 * @param string $js The code to execute
 	 * @param boolean $ret_false whether or not to return false
 	 * @return string
 	 */
@@ -235,6 +235,8 @@ 
 	 * @param string - element
 	 * @param string - Javascript code for mouse over
 	 * @param string - Javascript code for mouse out
+	 * @param string $over
+	 * @param string $out
 	 * @return string
 	 */
 	public function _hover($element='this', $over, $out) {
@@ -768,7 +770,7 @@ 
 	 *
 	 * @param string $element
 	 * @param array $options
-	 * @return void
+	 * @return string
 	 */
 	public function sortable($element, $options=array()) {
 		if (count($options)>0) {
@@ -904,6 +906,7 @@ 
 	/**
 	 * A wrapper for writing document.ready()
 	 *
+	 * @param string $js
 	 * @return string
 	 */
 	public function _document_ready($js) {
@@ -958,7 +961,7 @@ 
 	/**
 	 * Ensures the speed parameter is valid for jQuery
 	 *
-	 * @param string|int $speed
+	 * @param string $speed
 	 * @return string
 	 */
 	private function _validate_speed($speed) {
@@ -973,6 +976,10 @@ 
 		return $speed;
 	}
 	// ------------------------------------------------------------------------
+
+	/**
+	 * @param string $retour
+	 */
 	protected function addLoading(&$retour, $responseElement) {
 		$loading_notifier='<div class="ajax-loader">';
 		if ($this->ajaxLoader=='') {
@@ -985,13 +992,25 @@ 
 		$retour.="\t\t$({$responseElement}).prepend('{$loading_notifier}');\n";
 	}
 
+	/**
+	 * @param string $url
+	 * @param string $jsCallback
+	 */
 	public function _get($url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true,$immediatly=false) {
 		return $this->_ajax("get", $url,$params,$responseElement,$jsCallback,$attr,$hasLoader,$immediatly);
 	}
+
+	/**
+	 * @param string $url
+	 * @param string $jsCallback
+	 */
 	public function _post($url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true,$immediatly=false) {
 		return $this->_ajax("post", $url,$params,$responseElement,$jsCallback,$attr,$hasLoader,$immediatly);
 	}
 
+	/**
+	 * @param string $method
+	 */
 	protected function _ajax($method,$url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true,$immediatly=false) {
 		if(JString::isNull($params)){$params="{}";}
 		$jsCallback=isset($jsCallback) ? $jsCallback : "";
@@ -1008,6 +1027,9 @@ 
 		return $retour;
 	}
 
+	/**
+	 * @param string $attr
+	 */
 	protected function _getAjaxUrl($url,$attr){
 		$url=$this->_correctAjaxUrl($url);
 		$retour="url='".$url."';\n";
@@ -1139,6 +1161,12 @@ 
 		return $this->_add_event($element, $this->_jsonArray($maskSelector,$url,$method, $params,$jsCallback, $attr, $context), $event, $preventDefault, $stopPropagation,$immediatly);
 	}
 
+	/**
+	 * @param string $url
+	 * @param string $form
+	 * @param string $responseElement
+	 * @param string $jsCallback
+	 */
 	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);
@@ -1252,7 +1280,7 @@ 
 	 * @param string $element
 	 * @param string $elementToModify
 	 * @param string $jqueryCall
-	 * @param string|array $param
+	 * @param string $param
 	 * @param boolean $preventDefault
 	 * @param boolean $stopPropagation
 	 * @param string $jsCallback javascript code to execute after the jquery call
@@ -1290,6 +1318,9 @@ 
 		return $this->_add_event($element, $this->_exec($js), $event, $preventDefault, $stopPropagation,$immediatly);
 	}
 
+	/**
+	 * @param string $input
+	 */
 	private function minify($input) {
 	if(trim($input) === "") return $input;
 	return preg_replace(

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)

Braces +98 added lines, -66 removed lines

@@ -424,8 +424,9 @@ 
 		$element=$this->_prep_element($element);
 		$value=$this->_prep_value($value);
 		$str="$({$element}).after({$value});";
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$str;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$str;
+		}
 		return $str;
 	}
 
@@ -441,10 +442,12 @@ 
 		if (isset($value)) {
 			$value=$this->_prep_value($value);
 			$str="$({$element}).attr(\"$attributeName\",{$value});";
-		} else
-			$str="$({$element}).attr(\"$attributeName\");";
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$str;
+		} else {
+					$str="$({$element}).attr(\"$attributeName\");";
+		}
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$str;
+		}
 		return $str;
 	}
 
@@ -460,10 +463,12 @@ 
 		if (isset($param)) {
 			$param=$this->_prep_value($param);
 			$str="$({$element}).{$jQueryCall}({$param});";
-		} else
-			$str="$({$element}).{$jQueryCall}();";
-			if ($immediatly)
-				$this->jquery_code_for_compile[]=$str;
+		} else {
+					$str="$({$element}).{$jQueryCall}();";
+		}
+			if ($immediatly) {
+							$this->jquery_code_for_compile[]=$str;
+			}
 			return $str;
 	}
 	/**
@@ -478,8 +483,9 @@ 
 		$to=$this->_prep_element($to);
 		$element=$this->_prep_element($element);
 		$str="$({$to}).{$jQueryCall}({$element});";
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$str;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$str;
+		}
 			return $str;
 	}
 	// --------------------------------------------------------------------
@@ -516,8 +522,9 @@ 
 
 		$str="$({$element}).animate({\n$animations\n\t\t}".$speed.$extra.");";
 
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$str;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$str;
+		}
 		return $str;
 	}
 
@@ -542,8 +549,9 @@ 
 
 		$str="$({$element}).fadeIn({$speed}{$callback});";
 
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$str;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$str;
+		}
 		return $str;
 	}
 
@@ -568,8 +576,9 @@ 
 
 		$str="$({$element}).fadeOut({$speed}{$callback});";
 
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$str;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$str;
+		}
 		return $str;
 	}
 
@@ -594,8 +603,9 @@ 
 
 		$str="$({$element}).hide({$speed}{$callback});";
 
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$str;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$str;
+		}
 		return $str;
 	}
 
@@ -622,8 +632,9 @@ 
 
 		$str="$({$element}).slideUp({$speed}{$callback});";
 
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$str;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$str;
+		}
 		return $str;
 	}
 
@@ -648,8 +659,9 @@ 
 
 		$str="$({$element}).slideDown({$speed}{$callback});";
 
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$str;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$str;
+		}
 		return $str;
 	}
 
@@ -674,8 +686,9 @@ 
 
 		$str="$({$element}).slideToggle({$speed}{$callback});";
 
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$str;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$str;
+		}
 		return $str;
 	}
 
@@ -692,8 +705,9 @@ 
 		$element=$this->_prep_element($element);
 		$str="$({$element}).toggle();";
 
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$str;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$str;
+		}
 		return $str;
 	}
 
@@ -709,8 +723,9 @@ 
 		$element=$this->_prep_element($element);
 		$str="$({$element}).trigger(\"$event\");";
 
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$str;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$str;
+		}
 		return $str;
 	}
 
@@ -735,8 +750,9 @@ 
 
 		$str="$({$element}).show({$speed}{$callback});";
 
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$str;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$str;
+		}
 		return $str;
 	}
 
@@ -754,8 +770,9 @@ 
 			$str.="else{".$jsCodeIfFalse."}";
 		}
 
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$str;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$str;
+		}
 		return $str;
 	}
 
@@ -821,12 +838,14 @@ 
 		if ($stopPropagation===true) {
 			$js="event.stopPropagation();\n".$js;
 		}
-		if (array_search($event, $this->jquery_events)===false)
-			$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)
-			$this->jquery_code_for_compile[]=$event;
+		if (array_search($event, $this->jquery_events)===false) {
+					$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) {
+					$this->jquery_code_for_compile[]=$event;
+		}
 		return $event;
 	}
 
@@ -879,8 +898,9 @@ 
 		}
 		$output=($script_tags===FALSE) ? $script : $this->inline($script);
 
-		if ($view!=NULL)
-			$view->setVar($view_var, $output);
+		if ($view!=NULL) {
+					$view->setVar($view_var, $output);
+		}
 		return $output;
 	}
 
@@ -1003,8 +1023,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;
 	}
 
@@ -1012,13 +1033,15 @@ 
 		$url=$this->_correctAjaxUrl($url);
 		$retour="url='".$url."';\n";
 		$slash="/";
-		if(PhalconUtils::endsWith($url, "/"))
-			$slash="";
+		if(PhalconUtils::endsWith($url, "/")) {
+					$slash="";
+		}
 		if(JString::isNotNull($attr)){
-			if ($attr=="value")
-				$retour.="url=url+'".$slash."'+$(this).val();\n";
-			else if($attr!=null && $attr!=="")
-				$retour.="url=url+'".$slash."'+($(this).attr('".$attr."')||'');\n";
+			if ($attr=="value") {
+							$retour.="url=url+'".$slash."'+$(this).val();\n";
+			} else if($attr!=null && $attr!=="") {
+							$retour.="url=url+'".$slash."'+($(this).attr('".$attr."')||'');\n";
+			}
 		}
 		return $retour;
 	}
@@ -1040,8 +1063,9 @@ 
 	}
 
 	protected function _correctAjaxUrl($url) {
-		if (PhalconUtils::endsWith($url, "/"))
-			$url=substr($url, 0, strlen($url)-1);
+		if (PhalconUtils::endsWith($url, "/")) {
+					$url=substr($url, 0, strlen($url)-1);
+		}
 		if (strncmp($url, 'http://', 7)!=0&&strncmp($url, 'https://', 8)!=0) {
 			$url=$this->_di->get("url")->get($url);
 		}
@@ -1065,8 +1089,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;
 	}
 
@@ -1105,7 +1130,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)";
 		}
@@ -1115,8 +1140,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;
 	}
 	/**
@@ -1157,8 +1183,9 @@ 
 			}});\n";
 			$retour.="$('#".$form."').submit();\n";
 		}
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$retour;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$retour;
+		}
 		return $retour;
 	}
 
@@ -1238,11 +1265,13 @@ 
 	public function _doJQuery($element, $jqueryCall, $param="", $jsCallback="", $immediatly=false) {
 		$param=$this->_prep_value($param);
 		$callback="";
-		if ($jsCallback!="")
-			$callback=", function(event){\n{$jsCallback}\n}";
+		if ($jsCallback!="") {
+					$callback=", function(event){\n{$jsCallback}\n}";
+		}
 		$script="$(".$this->_prep_element($element).").".$jqueryCall."(".$param.$callback.");\n";
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$script;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$script;
+		}
 		return $script;
 	}
 
@@ -1271,8 +1300,9 @@ 
 	 */
 	public function _exec($js, $immediatly=false) {
 		$script=$js."\n";
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$script;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$script;
+		}
 		return $script;
 	}
 
@@ -1291,7 +1321,9 @@ 
 	}
 
 	private function minify($input) {
-	if(trim($input) === "") return $input;
+	if(trim($input) === "") {
+		return $input;
+	}
 	return preg_replace(
 			array(
 					// Remove comment(s)

Ajax/bootstrap/html/HtmlBreadcrumbs.php

Doc Comments +3 added lines, -1 removed lines

@@ -164,7 +164,6 @@ 
 	 * Associate an ajax get to the breadcrumbs elements, displayed in $targetSelector
 	 * $attr member is used to build each element url
 	 * @param string $targetSelector the target of the get
-	 * @param string $attr the html attribute used to build the elements url
 	 * @return HtmlBreadcrumbs
 	 */
 	public function autoGetOnClick($targetSelector){
@@ -178,6 +177,9 @@ 
 		return parent::contentAsString();
 	}
 
+	/**
+	 * @param integer $index
+	 */
 	public function getElement($index){
 		return $this->content[$index];
 	}

Braces +6 added lines, -5 removed lines

@@ -65,9 +65,9 @@ 
 		if(is_array($element)){
 			$elm=new HtmlLink("lnk-".$this->identifier."-".$size);
 			$elm->fromArray($element);
-		}else if($element instanceof HtmlLink){
+		} else if($element instanceof HtmlLink){
 			$elm=$element;
-		}else{
+		} else{
 			$elm=new HtmlLink("lnk-".$this->identifier."-".$size,$href,$element);
 			if(isset($glyph)){
 				$elm->wrapContentWithGlyph($glyph);
@@ -114,7 +114,7 @@ 
 		}
 		if($this->absolutePaths===true){
 			return $this->_hrefFunction($this->content[$index]);
-		}else{
+		} else{
 			return $this->root.implode($separator, array_slice(array_map(function($e){return $this->_hrefFunction($e);}, $this->content),$this->startIndex,$index+1));
 		}
 	}
@@ -204,8 +204,9 @@ 
 		if(\sizeof($params)>0 || \strtolower($action)!="index" ){
 			$items[]=$action;
 			foreach ($params as $p){
-				if(\is_object($p)===false)
-				$items[]=$p;
+				if(\is_object($p)===false) {
+								$items[]=$p;
+				}
 			}
 		}
 		return $this->addElements($items);

Spacing +38 added lines, -38 removed lines

@@ -41,15 +41,15 @@ 
 	 * @param boolean $autoActive sets the last element's class to <b>active</b> if true
 	 * @param function $hrefFunction the function who generates the href elements. default : function($e){return $e->getContent()}
 	 */
-	public function __construct($identifier,$elements=array(),$autoActive=true,$startIndex=0,$hrefFunction=NULL){
-		parent::__construct($identifier,"ol");
+	public function __construct($identifier, $elements=array(), $autoActive=true, $startIndex=0, $hrefFunction=NULL) {
+		parent::__construct($identifier, "ol");
 		$this->startIndex=$startIndex;
 		$this->setProperty("class", "breadcrumb");
 		$this->content=array();
 		$this->autoActive=$autoActive;
 		$this->absolutePaths;
-		$this->_hrefFunction=function ($e){return $e->getContent();};
-		if(isset($hrefFunction)){
+		$this->_hrefFunction=function($e) {return $e->getContent(); };
+		if (isset($hrefFunction)) {
 			$this->_hrefFunction=$hrefFunction;
 		}
 		$this->addElements($elements);
@@ -60,43 +60,43 @@ 
 	 * @param string $href
 	 * @return \Ajax\bootstrap\html\HtmlLink
 	 */
-	public function addElement($element,$href="",$glyph=NULL){
+	public function addElement($element, $href="", $glyph=NULL) {
 		$size=sizeof($this->content);
-		if(is_array($element)){
+		if (is_array($element)) {
 			$elm=new HtmlLink("lnk-".$this->identifier."-".$size);
 			$elm->fromArray($element);
-		}else if($element instanceof HtmlLink){
+		}else if ($element instanceof HtmlLink) {
 			$elm=$element;
-		}else{
-			$elm=new HtmlLink("lnk-".$this->identifier."-".$size,$href,$element);
-			if(isset($glyph)){
+		}else {
+			$elm=new HtmlLink("lnk-".$this->identifier."-".$size, $href, $element);
+			if (isset($glyph)) {
 				$elm->wrapContentWithGlyph($glyph);
 			}
 		}
-		$elm->wrap("<li>","</li>");
+		$elm->wrap("<li>", "</li>");
 		$this->content[]=$elm;
 		$elm->setProperty($this->attr, $this->getHref($size));
 		return $elm;
 	}
 
-	public function setActive($index=null){
-		if(!isset($index)){
+	public function setActive($index=null) {
+		if (!isset($index)) {
 			$index=sizeof($this->content)-1;
 		}
-		$li=new HtmlBsDoubleElement("","li");
+		$li=new HtmlBsDoubleElement("", "li");
 		$li->setClass("active");
 		$li->setContent($this->content[$index]->getContent());
 		$this->content[$index]=$li;
 	}
 
-	public function addElements($elements){
-		foreach ( $elements as $element ) {
+	public function addElements($elements) {
+		foreach ($elements as $element) {
 			$this->addElement($element);
 		}
 		return $this;
 	}
 
-	public function fromArray($array){
+	public function fromArray($array) {
 		$array=parent::fromArray($array);
 		$this->addElements($array);
 		return $array;
@@ -108,14 +108,14 @@ 
 	 * @param string $separator
 	 * @return string
 	 */
-	public function getHref($index=null,$separator="/"){
-		if(!isset($index)){
+	public function getHref($index=null, $separator="/") {
+		if (!isset($index)) {
 			$index=sizeof($this->content);
 		}
-		if($this->absolutePaths===true){
+		if ($this->absolutePaths===true) {
 			return $this->_hrefFunction($this->content[$index]);
-		}else{
-			return $this->root.implode($separator, array_slice(array_map(function($e){return $this->_hrefFunction($e);}, $this->content),$this->startIndex,$index+1));
+		}else {
+			return $this->root.implode($separator, array_slice(array_map(function($e) {return $this->_hrefFunction($e); }, $this->content), $this->startIndex, $index+1));
 		}
 	}
 
@@ -124,7 +124,7 @@ 
 	 * @see \Ajax\bootstrap\html\BaseHtml::compile()
 	 */
 	public function compile(JsUtils $js=NULL, View $view=NULL) {
-		if($this->autoActive){
+		if ($this->autoActive) {
 			$this->setActive();
 		}
 		return parent::compile($js, $view);
@@ -142,19 +142,19 @@ 
 	 * @see \Ajax\bootstrap\html\base\BaseHtml::on()
 	 */
 	public function on($event, $jsCode, $stopPropagation=false, $preventDefault=false) {
-		foreach ($this->content as $element){
-			$element->on($event,$jsCode,$stopPropagation,$preventDefault);
+		foreach ($this->content as $element) {
+			$element->on($event, $jsCode, $stopPropagation, $preventDefault);
 		}
 		return $this;
 	}
 
 	public function setAutoActive($autoActive) {
-		$this->autoActive = $autoActive;
+		$this->autoActive=$autoActive;
 		return $this;
 	}
 
 	public function _ajaxOn($operation, $event, $url, $responseElement="", $parameters=array()) {
-		foreach ($this->content as $element){
+		foreach ($this->content as $element) {
 			$element->_ajaxOn($operation, $event, $url, $responseElement, $parameters);
 		}
 		return $this;
@@ -167,18 +167,18 @@ 
 	 * @param string $attr the html attribute used to build the elements url
 	 * @return HtmlBreadcrumbs
 	 */
-	public function autoGetOnClick($targetSelector){
-		return $this->getOnClick($this->root, $targetSelector,array("attr"=>$this->attr));
+	public function autoGetOnClick($targetSelector) {
+		return $this->getOnClick($this->root, $targetSelector, array("attr"=>$this->attr));
 	}
 
-	public function contentAsString(){
-		if($this->autoActive){
+	public function contentAsString() {
+		if ($this->autoActive) {
 			$this->setActive();
 		}
 		return parent::contentAsString();
 	}
 
-	public function getElement($index){
+	public function getElement($index) {
 		return $this->content[$index];
 	}
 
@@ -187,7 +187,7 @@ 
 	 * @param mixed $glyph
 	 * @param int $index
 	 */
-	public function addGlyph($glyph,$index=0){
+	public function addGlyph($glyph, $index=0) {
 		$elm=$this->getElement($index);
 		return $elm->wrapContentWithGlyph($glyph);
 	}
@@ -197,15 +197,15 @@ 
 	 * @param Dispatcher $dispatcher the request dispatcher
 	 * @return \Ajax\bootstrap\html\HtmlBreadcrumbs
 	 */
-	public function fromDispatcher($dispatcher,$startIndex=0){
+	public function fromDispatcher($dispatcher, $startIndex=0) {
 		$this->startIndex=$startIndex;
 		$params=$dispatcher->getParams();
 		$action=$dispatcher->getActionName();
 		$items=array($dispatcher->getControllerName());
-		if(\sizeof($params)>0 || \strtolower($action)!="index" ){
+		if (\sizeof($params)>0 || \strtolower($action)!="index") {
 			$items[]=$action;
-			foreach ($params as $p){
-				if(\is_object($p)===false)
+			foreach ($params as $p) {
+				if (\is_object($p)===false)
 				$items[]=$p;
 			}
 		}
@@ -219,7 +219,7 @@ 
 	 * @return \Ajax\bootstrap\html\HtmlBreadcrumbs
 	 */
 	public function setHrefFunction($_hrefFunction) {
-		$this->_hrefFunction = $_hrefFunction;
+		$this->_hrefFunction=$_hrefFunction;
 		return $this;
 	}
 

Ajax/bootstrap/html/HtmlProgressbar.php

Doc Comments +16 added lines, -1 removed lines

@@ -19,6 +19,9 @@ 
 	protected $style="";
 	protected $styleLimits=null;
 
+	/**
+	 * @param string $identifier
+	 */
 	public function __construct($identifier, $style="info", $value=0, $max=100, $min=0) {
 		parent::__construct($identifier);
 		$this->_template=include 'templates/tplProgressbar.php';
@@ -28,6 +31,9 @@ 
 		$this->setStyle($style);
 	}
 
+	/**
+	 * @param boolean $value
+	 */
 	public function setActive($value) {
 		if(is_array($this->content)){
 			foreach ($this->content as $pb){
@@ -42,6 +48,9 @@ 
 		return $this;
 	}
 
+	/**
+	 * @param boolean $value
+	 */
 	public function setStriped($value) {
 		if(is_array($this->content)){
 			foreach ($this->content as $pb){
@@ -56,6 +65,9 @@ 
 		return $this;
 	}
 
+	/**
+	 * @param boolean $value
+	 */
 	public function showCaption($value) {
 		if(is_array($this->content)){
 			foreach ($this->content as $pb){
@@ -113,6 +125,9 @@ 
 		return $this->isStacked;
 	}
 
+	/**
+	 * @param boolean $isStacked
+	 */
 	public function setIsStacked($isStacked) {
 		$this->isStacked=$isStacked;
 		return $this;
@@ -121,7 +136,7 @@ 
 	/**
 	 * define the progressbar style
 	 * avaible values : "success","info","warning","danger"
-	 * @param string|int $cssStyle
+	 * @param string $cssStyle
 	 * @return \Ajax\bootstrap\html\HtmlProgressbar default : ""
 	 */
 	public function setStyle($cssStyle) {

Spacing +14 added lines, -14 removed lines

@@ -29,11 +29,11 @@ 
 	}
 
 	public function setActive($value) {
-		if(is_array($this->content)){
-			foreach ($this->content as $pb){
+		if (is_array($this->content)) {
+			foreach ($this->content as $pb) {
 				$pb->setActive($value);
 			}
-		}else{
+		}else {
 			if ($value===true)
 				$this->active="active";
 			else
@@ -43,11 +43,11 @@ 
 	}
 
 	public function setStriped($value) {
-		if(is_array($this->content)){
-			foreach ($this->content as $pb){
+		if (is_array($this->content)) {
+			foreach ($this->content as $pb) {
 				$pb->setStriped($value);
 			}
-		}else{
+		}else {
 			if ($value===true)
 				$this->striped="progress-bar-striped";
 			else
@@ -57,11 +57,11 @@ 
 	}
 
 	public function showCaption($value) {
-		if(is_array($this->content)){
-			foreach ($this->content as $pb){
+		if (is_array($this->content)) {
+			foreach ($this->content as $pb) {
 				$pb->showCaption($value);
 			}
-		}else{
+		}else {
 			if ($value===true)
 				$this->caption="%value%%";
 			else
@@ -81,7 +81,7 @@ 
 		$progressBar->setStriped($this->striped!=="" || $progressBar->isStriped());
 		$progressBar->setActive($this->active==="active" || $progressBar->isActive());
 		if (is_array($this->content)===false) {
-			$this->content=array ();
+			$this->content=array();
 		}
 		$this->content []=$progressBar;
 	}
@@ -125,7 +125,7 @@ 
 	 * @return \Ajax\bootstrap\html\HtmlProgressbar default : ""
 	 */
 	public function setStyle($cssStyle) {
-		return $this->setMemberCtrl($this->style,CssRef::getStyle($cssStyle, "progress-bar"), CssRef::Styles("progress-bar"));
+		return $this->setMemberCtrl($this->style, CssRef::getStyle($cssStyle, "progress-bar"), CssRef::Styles("progress-bar"));
 	}
 
 	/*
@@ -134,10 +134,10 @@ 
 	 */
 	public function compile(JsUtils $js=NULL, View $view=NULL) {
 		$actualStyle=$this->style;
-		if(isset($this->styleLimits)&& JArray::isAssociative($this->styleLimits)){
-			foreach ($this->styleLimits as $k=>$v){
+		if (isset($this->styleLimits) && JArray::isAssociative($this->styleLimits)) {
+			foreach ($this->styleLimits as $k=>$v) {
 				$actualStyle=$k;
-				if($v>$this->value)
+				if ($v>$this->value)
 					break;
 			}
 		}

Braces +21 added lines, -17 removed lines

@@ -33,11 +33,12 @@ 
 			foreach ($this->content as $pb){
 				$pb->setActive($value);
 			}
-		}else{
-			if ($value===true)
-				$this->active="active";
-			else
-				$this->active="";
+		} else{
+			if ($value===true) {
+							$this->active="active";
+			} else {
+							$this->active="";
+			}
 		}
 		return $this;
 	}
@@ -47,11 +48,12 @@ 
 			foreach ($this->content as $pb){
 				$pb->setStriped($value);
 			}
-		}else{
-			if ($value===true)
-				$this->striped="progress-bar-striped";
-			else
-				$this->striped="";
+		} else{
+			if ($value===true) {
+							$this->striped="progress-bar-striped";
+			} else {
+							$this->striped="";
+			}
 		}
 		return $this;
 	}
@@ -61,11 +63,12 @@ 
 			foreach ($this->content as $pb){
 				$pb->showCaption($value);
 			}
-		}else{
-			if ($value===true)
-				$this->caption="%value%%";
-			else
-				$this->caption='<span class="sr-only">%value%% Complete (%style%)</span>';
+		} else{
+			if ($value===true) {
+							$this->caption="%value%%";
+			} else {
+							$this->caption='<span class="sr-only">%value%% Complete (%style%)</span>';
+			}
 		}
 		return $this;
 	}
@@ -137,8 +140,9 @@ 
 		if(isset($this->styleLimits)&& JArray::isAssociative($this->styleLimits)){
 			foreach ($this->styleLimits as $k=>$v){
 				$actualStyle=$k;
-				if($v>$this->value)
-					break;
+				if($v>$this->value) {
+									break;
+				}
 			}
 		}
 		$this->style=$actualStyle;

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,$startIndex=0,$hrefFunction=NULL){
-		return $this->addHtmlComponent(new HtmlBreadcrumbs($identifier,$elements,$autoActive,$startIndex,$hrefFunction));
+	public function htmlBreadcrumbs($identifier, $elements=array(), $autoActive=true, $startIndex=0, $hrefFunction=NULL) {
+		return $this->addHtmlComponent(new HtmlBreadcrumbs($identifier, $elements, $autoActive, $startIndex, $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/common/html/PropertyWrapper.php

Doc Comments +3 added lines

@@ -7,6 +7,9 @@
 
 class PropertyWrapper {
 
+	/**
+	 * @param \Ajax\JsUtils $js
+	 */
 	public static function wrap($input, $js=NULL, $separator=' ', $valueQuote='"') {
 		$output="";
 		if (is_string($input)) {

Spacing +4 added lines, -4 removed lines

@@ -17,7 +17,7 @@ 
 				$value1=reset($input);
 				if (is_object($value1)) {
 					$output=PropertyWrapper::wrapObjects($input, $js, $separator=' ');
-				} else
+				}else
 					$output=PropertyWrapper::wrapStrings($input, $separator=' ', $valueQuote='"');
 			}
 		}
@@ -26,17 +26,17 @@ 
 
 	public static function wrapStrings($input, $separator=' ', $valueQuote='"') {
 		if (JArray::isAssociative($input)===true) {
-			$result=implode($separator, array_map(function ($v, $k) use($valueQuote) {
+			$result=implode($separator, array_map(function($v, $k) use($valueQuote) {
 				return $k.'='.$valueQuote.$v.$valueQuote;
 			}, $input, array_keys($input)));
-		} else {
+		}else {
 			$result=implode($separator, array_values($input));
 		}
 		return $result;
 	}
 
 	public static function wrapObjects($input, $js=NULL, $separator=' ') {
-		return implode($separator, array_map(function ($v) use($js) {
+		return implode($separator, array_map(function($v) use($js) {
 			return $v->compile($js);
 		}, $input));
 	}

Braces +8 added lines, -6 removed lines

@@ -17,8 +17,9 @@ 
 				$value1=reset($input);
 				if (is_object($value1)) {
 					$output=PropertyWrapper::wrapObjects($input, $js, $separator=' ');
-				} else
-					$output=PropertyWrapper::wrapStrings($input, $separator=' ', $valueQuote='"');
+				} else {
+									$output=PropertyWrapper::wrapStrings($input, $separator=' ', $valueQuote='"');
+				}
 			}
 		}
 		return $output;
@@ -37,10 +38,11 @@ 
 
 	public static function wrapObjects($input, $js=NULL, $separator=' ') {
 		return implode($separator, array_map(function ($v) use($js) {
-			if (is_object($v))
-				return $v->compile($js);
-			else
-				return $v;
+			if (is_object($v)) {
+							return $v->compile($js);
+			} else {
+							return $v;
+			}
 		}, $input));
 	}
 }
\ No newline at end of file

Ajax/Semantic.php

Braces +1 added lines, -1 removed lines

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

Spacing +37 added lines, -37 removed lines

@@ -62,7 +62,7 @@ 
 	 * @param string $identifier
 	 * @param string $icon
 	 */
-	public function htmlIcon($identifier,$icon){
+	public function htmlIcon($identifier, $icon) {
 		return $this->addHtmlComponent(new HtmlIcon($identifier, $icon));
 	}
 
@@ -71,14 +71,14 @@ 
 	 * @param string $size
 	 * @param array $icons
 	 */
-	public function htmlIconGroups($identifier,$size="",$icons=array()){
-		$group=new HtmlIconGroups($identifier,$size);
-		if(JArray::isAssociative($icons)){
-			foreach ($icons as $icon=>$size){
-				$group->add($icon,$size);
+	public function htmlIconGroups($identifier, $size="", $icons=array()) {
+		$group=new HtmlIconGroups($identifier, $size);
+		if (JArray::isAssociative($icons)) {
+			foreach ($icons as $icon=>$size) {
+				$group->add($icon, $size);
 			}
-		}else{
-			foreach ($icons as $icon){
+		}else {
+			foreach ($icons as $icon) {
 				$group->add($icon);
 			}
 		}
@@ -90,8 +90,8 @@ 
 	 * @param array $elements
 	 * @param boolean $asIcons
 	 */
-	public function htmlButtonGroups($identifier,$elements=array(),$asIcons=false){
-		return $this->addHtmlComponent(new HtmlButtonGroups($identifier, $elements,$asIcons));
+	public function htmlButtonGroups($identifier, $elements=array(), $asIcons=false) {
+		return $this->addHtmlComponent(new HtmlButtonGroups($identifier, $elements, $asIcons));
 	}
 
 	/**
@@ -99,7 +99,7 @@ 
 	 * @param string $identifier
 	 * @param string $content
 	 */
-	public function htmlContainer($identifier,$content=""){
+	public function htmlContainer($identifier, $content="") {
 		return $this->addHtmlComponent(new HtmlContainer($identifier, $content));
 	}
 
@@ -107,8 +107,8 @@ 
 	 * @param string $identifier
 	 * @param string $content
 	 */
-	public function htmlDivider($identifier,$content="",$tagName="div"){
-		return $this->addHtmlComponent(new HtmlDivider($identifier, $content,$tagName));
+	public function htmlDivider($identifier, $content="", $tagName="div") {
+		return $this->addHtmlComponent(new HtmlDivider($identifier, $content, $tagName));
 	}
 
 	/**
@@ -116,32 +116,32 @@ 
 	 * @param string $content
 	 * @param string $tagName
 	 */
-	public function htmlLabel($identifier,$content="",$tagName="div"){
-		return $this->addHtmlComponent(new HtmlLabel($identifier, $content,$tagName));
+	public function htmlLabel($identifier, $content="", $tagName="div") {
+		return $this->addHtmlComponent(new HtmlLabel($identifier, $content, $tagName));
 	}
 
 	/**
 	 * @param string $identifier
 	 * @param array $items
 	 */
-	public function htmlMenu($identifier,$items=array()){
-		return $this->addHtmlComponent(new HtmlMenu($identifier,$items));
+	public function htmlMenu($identifier, $items=array()) {
+		return $this->addHtmlComponent(new HtmlMenu($identifier, $items));
 	}
 
 	/**Adds an icon menu
 	 * @param string $identifier
 	 * @param array $items icons
 	 */
-	public function htmlIconMenu($identifier,$items=array()){
-		return $this->addHtmlComponent(new HtmlIconMenu($identifier,$items));
+	public function htmlIconMenu($identifier, $items=array()) {
+		return $this->addHtmlComponent(new HtmlIconMenu($identifier, $items));
 	}
 
 	/**Adds an labeled icon menu
 	 * @param string $identifier
 	 * @param array $items icons
 	 */
-	public function htmlLabeledIconMenu($identifier,$items=array()){
-		return $this->addHtmlComponent(new HtmlLabeledIconMenu($identifier,$items));
+	public function htmlLabeledIconMenu($identifier, $items=array()) {
+		return $this->addHtmlComponent(new HtmlLabeledIconMenu($identifier, $items));
 	}
 
 	/**
@@ -149,8 +149,8 @@ 
 	 * @param string $value
 	 * @param array $items
 	 */
-	public function htmlDropdown($identifier, $value="", $items=array()){
-		return $this->addHtmlComponent(new HtmlDropdown($identifier,$value,$items));
+	public function htmlDropdown($identifier, $value="", $items=array()) {
+		return $this->addHtmlComponent(new HtmlDropdown($identifier, $value, $items));
 	}
 
 	/**
@@ -158,8 +158,8 @@ 
 	 * @param string $identifier
 	 * @param string $content
 	 */
-	public function htmlMessage($identifier, $content=""){
-		return $this->addHtmlComponent(new HtmlMessage($identifier,$content));
+	public function htmlMessage($identifier, $content="") {
+		return $this->addHtmlComponent(new HtmlMessage($identifier, $content));
 	}
 
 	/**
@@ -167,8 +167,8 @@ 
 	 * @param string $identifier
 	 * @param string $content
 	 */
-	public function htmlSegment($identifier, $content=""){
-		return $this->addHtmlComponent(new HtmlSegment($identifier,$content));
+	public function htmlSegment($identifier, $content="") {
+		return $this->addHtmlComponent(new HtmlSegment($identifier, $content));
 	}
 
 	/**
@@ -176,16 +176,16 @@ 
 	 * @param string $identifier
 	 * @param array $items the segments
 	 */
-	public function htmlSegmentGroups($identifier, $items=array()){
-		return $this->addHtmlComponent(new HtmlSegmentGroups($identifier,$items));
+	public function htmlSegmentGroups($identifier, $items=array()) {
+		return $this->addHtmlComponent(new HtmlSegmentGroups($identifier, $items));
 	}
 
 	/**
 	 * @param string $identifier
 	 * @param mixed $content
 	 */
-	public function htmlPopup(BaseHtml $container,$identifier,$content){
-		return $this->addHtmlComponent(new HtmlPopup($container,$identifier,$content));
+	public function htmlPopup(BaseHtml $container, $identifier, $content) {
+		return $this->addHtmlComponent(new HtmlPopup($container, $identifier, $content));
 	}
 
 	/**
@@ -195,8 +195,8 @@ 
 	 * @param boolean $createCols
 	 * @param boolean $implicitRows
 	 */
-	public function htmlGrid($identifier,$numRows=1,$numCols=NULL,$createCols=true,$implicitRows=false){
-		return $this->addHtmlComponent(new HtmlGrid($identifier,$numRows,$numCols,$createCols,$implicitRows));
+	public function htmlGrid($identifier, $numRows=1, $numCols=NULL, $createCols=true, $implicitRows=false) {
+		return $this->addHtmlComponent(new HtmlGrid($identifier, $numRows, $numCols, $createCols, $implicitRows));
 	}
 
 	/**
@@ -205,11 +205,11 @@ 
 	 * @param mixed $content
 	 * @param string $type
 	 */
-	public function htmlHeader($identifier,$niveau=1,$content=NULL,$type="page"){
-		return $this->addHtmlComponent(new HtmlHeader($identifier,$niveau,$content,$type));
+	public function htmlHeader($identifier, $niveau=1, $content=NULL, $type="page") {
+		return $this->addHtmlComponent(new HtmlHeader($identifier, $niveau, $content, $type));
 	}
 
-	public function htmlInput($identifier,$type="text",$value="",$placeholder=""){
-		return $this->addHtmlComponent(new HtmlInput($identifier,$type,$value,$placeholder));
+	public function htmlInput($identifier, $type="text", $value="", $placeholder="") {
+		return $this->addHtmlComponent(new HtmlInput($identifier, $type, $value, $placeholder));
 	}
 }
\ No newline at end of file