jcheron / phalcon-jquery

Ajax/bootstrap/html/HtmlAlert.php

Spacing +3 added lines, -3 removed lines

@@ -44,13 +44,13 @@ 
 
 	public function addCloseButton() {
 		$button=new HtmlButton("close-".$this->identifier);
-		$button->setProperties(array (
+		$button->setProperties(array(
 				"class" => "close",
 				"data-dismiss" => "alert",
 				"aria-label" => "close"
 		));
 		$button->setValue('<span aria-hidden="true">&times;</span>');
-		$this->addToPropertyCtrl("class", "alert-dismissible", array (
+		$this->addToPropertyCtrl("class", "alert-dismissible", array(
 				"alert-dismissible"
 		));
 		$this->button=$button;
@@ -79,7 +79,7 @@ 
 	 * @see \Ajax\bootstrap\html\base\BaseHtml::compile()
 	 */
 	public function compile(JsUtils $js=NULL, View $view=NULL) {
-		if ($this->closeable&&$this->button==="") {
+		if ($this->closeable && $this->button==="") {
 			$this->addCloseButton();
 		}
 		return parent::compile($js, $view);

Ajax/bootstrap/html/HtmlButton.php

Spacing +3 added lines, -3 removed lines

@@ -71,7 +71,7 @@ 
 	 * @return \Ajax\bootstrap\html\HtmlButton
 	 */
 	public function setActive() {
-		return $this->addToPropertyCtrl("class", "active", array (
+		return $this->addToPropertyCtrl("class", "active", array(
 				"active"
 		));
 	}
@@ -81,7 +81,7 @@ 
 	 * @return \Ajax\bootstrap\html\HtmlButton
 	 */
 	public function setDisabled() {
-		return $this->addToPropertyCtrl("class", "disabled", array (
+		return $this->addToPropertyCtrl("class", "disabled", array(
 				"disabled"
 		));
 	}
@@ -109,7 +109,7 @@ 
 	 */
 	public function fromArray($array) {
 		$array=parent::fromArray($array);
-		foreach ( $array as $key => $value ) {
+		foreach ($array as $key => $value) {
 			$this->setProperty($key, $value);
 		}
 		return $array;

Ajax/bootstrap/html/HtmlCollapse.php

Spacing +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
 		if (!isset($id))
 			if ($this->element->getTagName()==="a")
 				$id=$this->element->getProperty("href");
-		if (!isset($id)||$id==="#") {
+		if (!isset($id) || $id==="#") {
 			$id="collapse-".$this->element->getIdentifier();
 			$this->attachTo($id);
 		}

Braces +11 added lines, -8 removed lines

@@ -24,17 +24,19 @@ 
 
 	public function attachTo($identifier) {
 		$this->element->setProperty("aria-controls", $identifier);
-		if ($this->element->getTagName()==="a")
-			$this->element->setProperty("href", "#".$identifier);
-		else
-			$this->element->setProperty("data-target", "#".$identifier);
+		if ($this->element->getTagName()==="a") {
+					$this->element->setProperty("href", "#".$identifier);
+		} else {
+					$this->element->setProperty("data-target", "#".$identifier);
+		}
 	}
 
 	public function getAttachedZone() {
 		$id=$this->element->getProperty("aria-controls");
-		if (!isset($id))
-			if ($this->element->getTagName()==="a")
+		if (!isset($id)) {
+					if ($this->element->getTagName()==="a")
 				$id=$this->element->getProperty("href");
+		}
 		if (!isset($id)||$id==="#") {
 			$id="collapse-".$this->element->getIdentifier();
 			$this->attachTo($id);
@@ -49,8 +51,9 @@ 
 	}
 
 	public function createCollapsedZone($content="", $attachTo=NULL) {
-		if (isset($attachTo))
-			$this->attachTo($attachTo);
+		if (isset($attachTo)) {
+					$this->attachTo($attachTo);
+		}
 		$collapsedZone=new HtmlDoubleElement($this->getAttachedZone());
 		$collapsedZone->setProperty("class", "collapse");
 		$collapsedZone->setContent($content);

Ajax/bootstrap/html/HtmlDropdown.php

Spacing +11 added lines, -11 removed lines

@@ -17,7 +17,7 @@ 
 	protected $class="dropdown-toggle";
 	protected $mClass="dropdown";
 	protected $mTagName="div";
-	protected $items=array ();
+	protected $items=array();
 
 	/**
 	 *
@@ -87,9 +87,9 @@ 
 	 * @return HtmlDropdownItem
 	 */
 	public function addItem($caption, $href="#") {
-		if($caption instanceof HtmlDropdownItem){
+		if ($caption instanceof HtmlDropdownItem) {
 			$item=$caption;
-		}else{
+		}else {
 			$iid=$this->getItemsCount()+1;
 			$item=new HtmlDropdownItem($this->identifier."-dropdown-item-".$iid);
 			$item->setCaption($caption)->setHref($href);
@@ -109,14 +109,14 @@ 
 	public function addItems($items) {
 		$iid=$this->getItemsCount()+1;
 		if (is_array($items)) {
-			foreach ( $items as $item ) {
+			foreach ($items as $item) {
 				if (is_string($item)) {
 					$this->addItem($item);
-				} else if (is_array($item)) {
+				}else if (is_array($item)) {
 					$dropDownItem=new HtmlDropdownItem($this->identifier."-dropdown-item-".$iid);
 					$dropDownItem->fromArray($item);
 					$this->items []=$dropDownItem;
-				} else if ($item instanceof HtmlDropdownItem) {
+				}else if ($item instanceof HtmlDropdownItem) {
 					$this->items []=$item;
 				}
 			}
@@ -136,7 +136,7 @@ 
 	}
 
 	public function setItems($items) {
-		$this->items=array ();
+		$this->items=array();
 		$this->addItems($items);
 	}
 
@@ -171,7 +171,7 @@ 
 	 */
 	public function run(JsUtils $js) {
 		if ($this->getProperty("role")==="nav") {
-			foreach ( $this->items as $dropdownItem ) {
+			foreach ($this->items as $dropdownItem) {
 				$dropdownItem->runNav($js);
 			}
 		}
@@ -263,9 +263,9 @@ 
 	/* (non-PHPdoc)
 	 * @see \Ajax\bootstrap\html\base\BaseHtml::on()
 	 */
-	public function on($event, $jsCode, $stopPropagation = false, $preventDefault = false) {
-		foreach ($this->items as $item){
-			$item->on($event, $jsCode,$stopPropagation,$preventDefault);
+	public function on($event, $jsCode, $stopPropagation=false, $preventDefault=false) {
+		foreach ($this->items as $item) {
+			$item->on($event, $jsCode, $stopPropagation, $preventDefault);
 		}
 	}
 

Braces +12 added lines, -9 removed lines

@@ -89,7 +89,7 @@ 
 	public function addItem($caption, $href="#") {
 		if($caption instanceof HtmlDropdownItem){
 			$item=$caption;
-		}else{
+		} else{
 			$iid=$this->getItemsCount()+1;
 			$item=new HtmlDropdownItem($this->identifier."-dropdown-item-".$iid);
 			$item->setCaption($caption)->setHref($href);
@@ -129,10 +129,11 @@ 
 	 * @see BaseHtml::fromArray()
 	 */
 	public function fromArray($array) {
-		if (array_keys($array)!==range(0, count($array)-1))
-			return parent::fromArray($array);
-		else
-			return $this->addItems($array);
+		if (array_keys($array)!==range(0, count($array)-1)) {
+					return parent::fromArray($array);
+		} else {
+					return $this->addItems($array);
+		}
 	}
 
 	public function setItems($items) {
@@ -185,8 +186,9 @@ 
 	 * @see \Ajax\bootstrap\html\BaseHtml::setTagName()
 	 */
 	public function setTagName($tagName) {
-		if ($tagName=="button")
-			$this->class="btn dropdown-toggle";
+		if ($tagName=="button") {
+					$this->class="btn dropdown-toggle";
+		}
 		return parent::setTagName($tagName);
 	}
 
@@ -204,8 +206,9 @@ 
 	}
 
 	public function setAlignment($alignment) {
-		if (is_int($alignment))
-			$alignment="dropdown-menu-".CssRef::alignment()[$alignment];
+		if (is_int($alignment)) {
+					$alignment="dropdown-menu-".CssRef::alignment()[$alignment];
+		}
 		return $this->addToMemberCtrl($this->class, $alignment, CssRef::alignment());
 	}
 

Doc Comments +12 added lines, -1 removed lines

@@ -22,6 +22,7 @@ 
 	/**
 	 *
 	 * @param string $identifier the id
+	 * @param string $cssStyle
 	 */
 	public function __construct($identifier, $value="", $items=array(), $cssStyle=null, $onClick=null) {
 		parent::__construct($identifier, "", $cssStyle, $onClick);
@@ -45,7 +46,7 @@ 
 	/**
 	 * define the button style
 	 * avaible values : "btn-default","btn-primary","btn-success","btn-info","btn-warning","btn-danger"
-	 * @param string|int $cssStyle
+	 * @param string $cssStyle
 	 * @return \Ajax\bootstrap\html\HtmlDropdown default : "btn-default"
 	 */
 	public function setStyle($cssStyle) {
@@ -149,10 +150,16 @@ 
 		return $this->items [$index];
 	}
 
+	/**
+	 * @param string $value
+	 */
 	public function setBtnClass($value) {
 		$this->class=$value;
 	}
 
+	/**
+	 * @param string $value
+	 */
 	public function setMClass($value) {
 		$this->mClass=$value;
 	}
@@ -183,6 +190,7 @@ 
 	/**
 	 * Sets the tagName's dropdown
 	 * @see \Ajax\bootstrap\html\BaseHtml::setTagName()
+	 * @param string $tagName
 	 */
 	public function setTagName($tagName) {
 		if ($tagName=="button")
@@ -194,6 +202,9 @@ 
 		return $this->compile();
 	}
 
+	/**
+	 * @param string $btnCaption
+	 */
 	public function setBtnCaption($btnCaption) {
 		$this->btnCaption=$btnCaption;
 		return $this;

Ajax/bootstrap/html/HtmlInput.php

Spacing +2 added lines, -2 removed lines

@@ -32,12 +32,12 @@
 	public function setLabel($label, $before=true) {
 		if ($before===true) {
 			$this->wrap("<label for='".$this->identifier."'>".$label."</label>", "");
-		} else {
+		}else {
 			$this->wrap("", "<label for='".$this->identifier."'>&nbsp;".$label."</label>");
 		}
 	}
 
-	public function setPlaceHolder($value){
+	public function setPlaceHolder($value) {
 		$this->setProperty("placeholder", $value);
 	}
 

Ajax/bootstrap/html/HtmlInputgroup.php

Spacing +6 added lines, -6 removed lines

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

Braces +17 added lines, -13 removed lines

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

Ajax/bootstrap/html/HtmlListgroup.php

Spacing +5 added lines, -5 removed lines

@@ -15,7 +15,7 @@ 
 
 	public function __construct($identifier, $tagName="ul") {
 		parent::__construct($identifier, $tagName);
-		$this->content=array ();
+		$this->content=array();
 		$this->_template='<%tagName% %properties%>%content%</%tagName%>';
 		$this->setProperty("class", "list-group");
 	}
@@ -23,8 +23,8 @@ 
 	public function addItem($text="") {
 		if (is_object($text)) {
 			$element=$text;
-		} else {
-			switch($this->tagName) {
+		}else {
+			switch ($this->tagName) {
 				case "ul":
 					$element=new HtmlDoubleElement("list-gi-".$this->identifier);
 					$element->setTagName("li");
@@ -45,10 +45,10 @@ 
 	}
 
 	public function addItems($items) {
-		foreach ( $items as $item ) {
+		foreach ($items as $item) {
 			if (is_string($item)) {
 				$this->addItem($item);
-			} else
+			}else
 				$this->content []=$item;
 		}
 	}

Braces +6 added lines, -4 removed lines

@@ -48,14 +48,16 @@
 		foreach ( $items as $item ) {
 			if (is_string($item)) {
 				$this->addItem($item);
-			} else
-				$this->content []=$item;
+			} else {
+							$this->content []=$item;
+			}
 		}
 	}
 
 	public function getItem($index) {
-		if ($index<sizeof($this->content))
-			return $this->content [$index];
+		if ($index<sizeof($this->content)) {
+					return $this->content [$index];
+		}
 	}
 
 	/* (non-PHPdoc)

Ajax/bootstrap/html/HtmlModal.php

Spacing +11 added lines, -11 removed lines

@@ -16,7 +16,7 @@ 
 class HtmlModal extends BaseHtml {
 	protected $title="Titre de ma boîte";
 	protected $content="";
-	protected $buttons=array ();
+	protected $buttons=array();
 	protected $showOnStartup=false;
 	protected $draggable=false;
 	protected $validCondition=NULL;
@@ -29,10 +29,10 @@ 
 	public function __construct($identifier, $title="", $content="", $buttonCaptions=array()) {
 		parent::__construct($identifier);
 		$this->_template=include 'templates/tplModal.php';
-		$this->buttons=array ();
+		$this->buttons=array();
 		$this->title=$title;
 		$this->content=$content;
-		foreach ( $buttonCaptions as $button ) {
+		foreach ($buttonCaptions as $button) {
 			$this->addButton($button);
 		}
 	}
@@ -67,7 +67,7 @@ 
 	 * @param string $value
 	 * @return HtmlButton
 	 */
-	public function addOkayButton($value="Okay",$jsCode="") {
+	public function addOkayButton($value="Okay", $jsCode="") {
 		$btn=$this->addButton($value, "btn-primary");
 		$btn->onClick("if(".$this->getValidCondition()."){ ".$jsCode."$('#".$this->identifier."').modal('hide');}");
 		return $btn;
@@ -84,7 +84,7 @@ 
 	public function getValidCondition() {
 		if ($this->validCondition==NULL) {
 			return $this->getDefaultValidCondition();
-		} else {
+		}else {
 			return $this->validCondition;
 		}
 	}
@@ -117,7 +117,7 @@ 
 	 * @param $params The parameters to pass to the view
 	 */
 	public function renderContent($view, $controller, $action, $params=NULL) {
-		$template=$view->getRender($controller, $action, $params, function ($view) {
+		$template=$view->getRender($controller, $action, $params, function($view) {
 			$view->setRenderLevel(View::LEVEL_ACTION_VIEW);
 		});
 		$this->content=$template;
@@ -129,12 +129,12 @@ 
 	 * @param string $controller a Phalcon controller
 	 * @param string $action a Phalcon action
 	 */
-	public function forward($initialController,$controller,$action){
-		$dispatcher = $initialController->dispatcher;
+	public function forward($initialController, $controller, $action) {
+		$dispatcher=$initialController->dispatcher;
 		$dispatcher->setControllerName($controller);
 		$dispatcher->setActionName($action);
 		$dispatcher->dispatch();
-		$template=$initialController->view->getRender($dispatcher->getControllerName(), $dispatcher->getActionName(),$dispatcher->getParams(), function ($view) {
+		$template=$initialController->view->getRender($dispatcher->getControllerName(), $dispatcher->getActionName(), $dispatcher->getParams(), function($view) {
 			$view->setRenderLevel(View::LEVEL_ACTION_VIEW);
 		});
 		$this->content=$template;
@@ -145,10 +145,10 @@ 
 	 * @see BaseHtml::run()
 	 */
 	public function run(JsUtils $js) {
-		if($this->content instanceof BaseHtml){
+		if ($this->content instanceof BaseHtml) {
 			$this->content->run($js);
 		}
-		$this->_bsComponent=$js->bootstrap()->modal("#".$this->identifier, array (
+		$this->_bsComponent=$js->bootstrap()->modal("#".$this->identifier, array(
 				"show" => $this->showOnStartup
 		));
 		if ($this->draggable)

Braces +11 added lines, -8 removed lines

@@ -151,18 +151,20 @@ 
 		$this->_bsComponent=$js->bootstrap()->modal("#".$this->identifier, array (
 				"show" => $this->showOnStartup
 		));
-		if ($this->draggable)
-			$this->_bsComponent->setDraggable(true);
+		if ($this->draggable) {
+					$this->_bsComponent->setDraggable(true);
+		}
 		$this->_bsComponent->setBackdrop($this->backdrop);
 		$this->addEventsOnRun($js);
 		return $this->_bsComponent;
 	}
 
 	public function getButton($index) {
-		if (is_int($index))
-			return $this->buttons [$index];
-		else
-			return $this->getElementById($index, $this->buttons);
+		if (is_int($index)) {
+					return $this->buttons [$index];
+		} else {
+					return $this->getElementById($index, $this->buttons);
+		}
 	}
 
 	public function showOnCreate() {
@@ -188,8 +190,9 @@ 
 
 	public function jsHideButton($index) {
 		$btn=$this->getButton($index);
-		if ($btn)
-			return "$('#".$btn->getIdentifier()."').hide();";
+		if ($btn) {
+					return "$('#".$btn->getIdentifier()."').hide();";
+		}
 	}
 
 	/**

Ajax/bootstrap/html/HtmlNavbar.php

Spacing +9 added lines, -9 removed lines

@@ -32,7 +32,7 @@ 
 	public function __construct($identifier, $brand="Brand", $brandHref="#") {
 		parent::__construct($identifier);
 		$this->_template=include 'templates/tplNavbar.php';
-		$this->navZones=array ();
+		$this->navZones=array();
 		$this->class="navbar-default";
 		$this->brand=$brand;
 		$this->brandHref=$brandHref;
@@ -60,7 +60,7 @@ 
 	}
 
 	public function setBrandImage($imageSrc) {
-		$this->brandImage=PhalconUtils::image(array (
+		$this->brandImage=PhalconUtils::image(array(
 				$imageSrc,
 				"alt" => $this->brand
 		));
@@ -107,11 +107,11 @@ 
 
 	public function setNavZones($navZones) {
 		if (is_array($navZones)) {
-			foreach ( $navZones as $zoneType => $zoneArray ) {
+			foreach ($navZones as $zoneType => $zoneArray) {
 				if (is_string($zoneType)) {
 					$zone=$this->addZone($zoneType);
 					$zone->fromArray($zoneArray);
-				} else if (is_string($zoneArray))
+				}else if (is_string($zoneArray))
 					$this->addElement($zoneArray);
 				else
 					$this->addElements($zoneArray);
@@ -146,8 +146,8 @@ 
 		if (is_int($index)) {
 			if ($index<$nb)
 				$zone=$this->navZones [$index];
-		} else {
-			for($i=0; $i<$nb; $i++) {
+		}else {
+			for ($i=0; $i<$nb; $i++) {
 				if ($this->navZones [$i]->getIdentifier()===$index) {
 					$zone=$this->navZones [$i];
 					break;
@@ -158,7 +158,7 @@ 
 	}
 
 	public function run(JsUtils $js) {
-		foreach ( $this->navZones as $zone ) {
+		foreach ($this->navZones as $zone) {
 			$zone->run($js);
 		}
 		if ($this->hasScrollspy) {
@@ -180,9 +180,9 @@ 
 	}
 
 	public function setFluid($fluid) {
-		if($fluid===true){
+		if ($fluid===true) {
 			$this->fluid="container-fluid";
-		}else{
+		}else {
 			$this->fluid="container";
 		}
 		return $this;

Braces +17 added lines, -13 removed lines

@@ -86,8 +86,9 @@ 
 
 	public function addElement($element, HtmlNavzone $zone=NULL) {
 		$zone=$this->getZoneToInsertIn($zone);
-		if ($element instanceof HtmlDropdown)
-			$element->setMTagName("li");
+		if ($element instanceof HtmlDropdown) {
+					$element->setMTagName("li");
+		}
 		$zone->addElement($element);
 	}
 
@@ -111,10 +112,11 @@ 
 				if (is_string($zoneType)) {
 					$zone=$this->addZone($zoneType);
 					$zone->fromArray($zoneArray);
-				} else if (is_string($zoneArray))
-					$this->addElement($zoneArray);
-				else
-					$this->addElements($zoneArray);
+				} else if (is_string($zoneArray)) {
+									$this->addElement($zoneArray);
+				} else {
+									$this->addElements($zoneArray);
+				}
 			}
 		}
 	}
@@ -127,10 +129,11 @@ 
 	public function getZoneToInsertIn($zone=NULL) {
 		if (!isset($zone)) {
 			$nb=sizeof($this->navZones);
-			if ($nb<1)
-				$zone=$this->addZone();
-			else
-				$zone=$this->navZones [$nb-1];
+			if ($nb<1) {
+							$zone=$this->addZone();
+			} else {
+							$zone=$this->navZones [$nb-1];
+			}
 		}
 		return $zone;
 	}
@@ -144,8 +147,9 @@ 
 		$zone=null;
 		$nb=sizeof($this->navZones);
 		if (is_int($index)) {
-			if ($index<$nb)
-				$zone=$this->navZones [$index];
+			if ($index<$nb) {
+							$zone=$this->navZones [$index];
+			}
 		} else {
 			for($i=0; $i<$nb; $i++) {
 				if ($this->navZones [$i]->getIdentifier()===$index) {
@@ -182,7 +186,7 @@ 
 	public function setFluid($fluid) {
 		if($fluid===true){
 			$this->fluid="container-fluid";
-		}else{
+		} else{
 			$this->fluid="container";
 		}
 		return $this;