jcheron / phalcon-jquery

Ajax/JsUtils.php

Doc Comments +4 added lines, -1 removed lines

@@ -719,6 +719,9 @@ 
 		return $this->_create_json($json_result, $match_array_type);
 	}
 
+	/**
+	 * @param boolean $match_array_type
+	 */
 	private function _create_json($json_result, $match_array_type) {
 		$json=array ();
 		$_is_assoc=TRUE;
@@ -742,7 +745,7 @@ 
 	 * Checks for an associative array
 	 *
 	 * @param type
-	 * @return type
+	 * @return boolean
 	 */
 	public function _is_associative_array($arr) {
 		foreach ( array_keys($arr) as $key => $val ) {

Braces +11 added lines, -8 removed lines

@@ -50,8 +50,9 @@ 
 
 	protected function _setDi($di) {
 		$this->_di=$di;
-		if ($this->js!=null&&$di!=null)
-			$this->js->setDi($di);
+		if ($this->js!=null&&$di!=null) {
+					$this->js->setDi($di);
+		}
 	}
 
 	/**
@@ -1130,12 +1131,14 @@ 
 					$result[1]=$cdn;
 					break;
 				case "Ajax\lib\CDNCoreCss":
-					if($cdn->getFramework()==="Bootstrap")
-						$hasBootstrap=true;
-					elseif($cdn->getFramework()==="Semantic")
-						$hasSemantic=true;
-					if($hasSemantic || $hasBootstrap)
-						$result[2]=$cdn;
+					if($cdn->getFramework()==="Bootstrap") {
+											$hasBootstrap=true;
+					} elseif($cdn->getFramework()==="Semantic") {
+											$hasSemantic=true;
+					}
+					if($hasSemantic || $hasBootstrap) {
+											$result[2]=$cdn;
+					}
 					break;
 			}
 		}

Spacing +33 added lines, -33 removed lines

@@ -25,7 +25,7 @@ 
  * JsUtils Class : Phalcon service to be injected
  */
 abstract class _JsUtils implements InjectionAwareInterface {
-	use JsUtilsEventsTrait,JsUtilsActionsTrait,JsUtilsAjaxTrait;
+	use JsUtilsEventsTrait, JsUtilsActionsTrait, JsUtilsAjaxTrait;
 
 	protected $_di;
 	protected $js;
@@ -54,7 +54,7 @@ 
 
 	protected function _setDi($di) {
 		$this->_di=$di;
-		if ($this->js!=null&&$di!=null)
+		if ($this->js!=null && $di!=null)
 			$this->js->setDi($di);
 	}
 
@@ -147,18 +147,18 @@ 
 
 
 	public function __construct($params=array()) {
-		$defaults=array (
+		$defaults=array(
 				'driver' => 'Jquery',
 				'debug' => true
 		);
-		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($defaults);
-		$this->cdns=array ();
+		$this->cdns=array();
 	}
 
 	public function addToCompile($jsScript) {
@@ -196,11 +196,11 @@ 
 	 */
 	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);
 		}
 		$sem=$this->_semantic;
-		if (isset($sem)&&isset($view)) {
+		if (isset($sem) && isset($view)) {
 			$sem->compileHtml($this, $view);
 		}
 		return $this->js->_compile($view, $view_var, $script_tags);
@@ -280,27 +280,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);
 			}
 		}
@@ -315,7 +315,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;
 			}
@@ -334,11 +334,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;
@@ -351,7 +351,7 @@ 
 
 	public function setCDNs($cdns) {
 		if (is_array($cdns)===false) {
-			$cdns=array (
+			$cdns=array(
 					$cdns
 			);
 		}
@@ -363,9 +363,9 @@ 
 		$hasJQueryUI=false;
 		$hasBootstrap=false;
 		$hasSemantic=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;
@@ -375,11 +375,11 @@ 
 					$result[1]=$cdn;
 					break;
 				case "Ajax\lib\CDNCoreCss":
-					if($cdn->getFramework()==="Bootstrap")
+					if ($cdn->getFramework()==="Bootstrap")
 						$hasBootstrap=true;
-					elseif($cdn->getFramework()==="Semantic")
+					elseif ($cdn->getFramework()==="Semantic")
 						$hasSemantic=true;
-					if($hasSemantic || $hasBootstrap)
+					if ($hasSemantic || $hasBootstrap)
 						$result[2]=$cdn;
 					break;
 			}
@@ -387,14 +387,14 @@ 
 		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)) {
-			$result[2]=new CDNCoreCss("Bootstrap","x");
+		if ($hasBootstrap===false && isset($this->_bootstrap)) {
+			$result[2]=new CDNCoreCss("Bootstrap", "x");
 		}
-		if ($hasSemantic===false&&isset($this->_semantic)) {
-			$result[2]=new CDNCoreCss("Semantic","x");
+		if ($hasSemantic===false && isset($this->_semantic)) {
+			$result[2]=new CDNCoreCss("Semantic", "x");
 		}
 		ksort($result);
 		return implode("\n", $result);
@@ -407,7 +407,7 @@ 
 			$this->_setDi($di);
 		}
 	}
-} else {
+}else {
 	class JsUtils extends _JsUtils {
 
 		public function setDi(DiInterface $di) {

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/bootstrap/html/base/HtmlBsDoubleElement.php

Spacing +5 added lines, -5 removed lines

@@ -23,19 +23,19 @@
 		return $this;
 	}
 
-	public function addGlyph($glyphicon,$before=true){
+	public function addGlyph($glyphicon, $before=true) {
 		$glyph=new HtmlGlyphicon("");
 		$glyph->setGlyphicon($glyphicon);
-		$this->addContent($glyph,$before);
+		$this->addContent($glyph, $before);
 		return $this;
 	}
 
-	public function wrapContentWithGlyph($glyphBefore,$glyphAfter=""){
+	public function wrapContentWithGlyph($glyphBefore, $glyphAfter="") {
 		$before=HtmlGlyphicon::getGlyphicon($glyphBefore)." ";
 		$after="";
-		if($glyphAfter!==""){
+		if ($glyphAfter!=="") {
 			$after=" ".HtmlGlyphicon::getGlyphicon($glyphAfter);
 		}
-		return $this->wrapContent($before,$after);
+		return $this->wrapContent($before, $after);
 	}
 }
\ No newline at end of file

Ajax/common/html/HtmlDoubleElement.php

Spacing +7 added lines, -7 removed lines

@@ -27,15 +27,15 @@ 
 		return $this->content;
 	}
 
-	public function addContent($content,$before=false) {
+	public function addContent($content, $before=false) {
 		if (is_array($this->content)===false) {
-			if(isset($this->content))
-				$this->content=array ($this->content);
+			if (isset($this->content))
+				$this->content=array($this->content);
 			else
 				$this->content=array();
 		}
-		if($before)
-			array_unshift($this->content,$content);
+		if ($before)
+			array_unshift($this->content, $content);
 		else
 			$this->content []=$content;
 		return $this;
@@ -49,8 +49,8 @@ 
 		parent::run($js);
 		if ($this->content instanceof HtmlDoubleElement) {
 			$this->content->run($js);
-		} else if (is_array($this->content)) {
-			foreach ( $this->content as $itemContent ) {
+		}else if (is_array($this->content)) {
+			foreach ($this->content as $itemContent) {
 				if ($itemContent instanceof HtmlDoubleElement) {
 					$itemContent->run($js);
 				}

Braces +10 added lines, -8 removed lines

@@ -29,15 +29,17 @@
 
 	public function addContent($content,$before=false) {
 		if (is_array($this->content)===false) {
-			if(isset($this->content))
-				$this->content=array ($this->content);
-			else
-				$this->content=array();
+			if(isset($this->content)) {
+							$this->content=array ($this->content);
+			} else {
+							$this->content=array();
+			}
+		}
+		if($before) {
+					array_unshift($this->content,$content);
+		} else {
+					$this->content []=$content;
 		}
-		if($before)
-			array_unshift($this->content,$content);
-		else
-			$this->content []=$content;
 		return $this;
 	}
 

Ajax/common/html/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/common/html/html5/HtmlOption.php

Spacing +3 added lines, -3 removed lines

@@ -10,7 +10,7 @@ 
 class HtmlOption extends HtmlDoubleElement {
 	protected $value;
 	protected $selected;
-	public function __construct($identifier,$caption,$value="") {
+	public function __construct($identifier, $caption, $value="") {
 		parent::__construct($identifier, "option");
 		$this->_template='<option id="%identifier%" value="%value%" %selected% %properties%>%content%</option>';
 		$this->content=$caption;
@@ -18,7 +18,7 @@ 
 		$this->selected="";
 	}
 	
-	public function select(){
+	public function select() {
 		$this->selected="selected";
 		return $this;
 	}
@@ -27,7 +27,7 @@ 
 		return $this->value;
 	}
 	public function setValue($value) {
-		$this->value = $value;
+		$this->value=$value;
 		return $this;
 	}
 	

Ajax/common/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);
 	}
 }

Braces +2 added lines, -2 removed lines

@@ -28,7 +28,7 @@ 
 	public function addOption($element,$value="",$selected=false){
 		if($element instanceof HtmlOption){
 			$option=$element;
-		}else{
+		} else{
 			$option=new HtmlOption($this->identifier."-".count($this->options), $element,$value);
 		}
 		if($selected || $option->getValue()==$this->getProperty("value")){
@@ -67,7 +67,7 @@ 
 			foreach ($array as $k=>$v){
 				$this->addOption($v, $k);
 			}
-		}else{
+		} else{
 			foreach ($array as $v){
 				$this->addOption($v, $v);
 			}

Ajax/bootstrap/html/HtmlBreadcrumbs.php

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