jcheron / phalcon-jquery

Ajax/semantic/html/elements/HtmlSegmentGroups.php

Spacing +10 added lines, -10 removed lines

@@ -6,20 +6,20 @@ 
 use Ajax\semantic\html\base\HtmlSemCollection;
 use Ajax\semantic\html\base\constants\Sens;
 
-class HtmlSegmentGroups extends HtmlSemCollection{
+class HtmlSegmentGroups extends HtmlSemCollection {
 
 
-	public function __construct( $identifier, $items=array()){
-		parent::__construct( $identifier, "div","ui segments");
+	public function __construct($identifier, $items=array()) {
+		parent::__construct($identifier, "div", "ui segments");
 		$this->addItems($items);
 	}
 
 
-	protected function createItem($value){
-		return new HtmlSegment("segment-".$this->count(),$value);
+	protected function createItem($value) {
+		return new HtmlSegment("segment-".$this->count(), $value);
 	}
 
-	protected function createCondition($value){
+	protected function createCondition($value) {
 		return !($value instanceof HtmlSegment);
 	}
 
@@ -28,16 +28,16 @@ 
 	 * @param string $type one of "raised","stacked","piled" default : ""
 	 * @return \Ajax\semantic\html\elements\HtmlSegmentGroups
 	 */
-	public function setType($type){
+	public function setType($type) {
 		return $this->addToPropertyCtrl("class", $type, SegmentType::getConstants());
 	}
 
-	public function setSens($sens=Sens::VERTICAL){
+	public function setSens($sens=Sens::VERTICAL) {
 		return $this->addToPropertyCtrl("class", $sens, Sens::getConstants());
 	}
 
-	public static function group($identifier,$items=array(),$type="",$sens=Sens::VERTICAL){
-		$group=new HtmlSegmentGroups($identifier,$items);
+	public static function group($identifier, $items=array(), $type="", $sens=Sens::VERTICAL) {
+		$group=new HtmlSegmentGroups($identifier, $items);
 		$group->setSens($sens);
 		return $group->setType($type);
 	}

Ajax/common/html/BaseHtml.php

Braces +26 added lines, -18 removed lines

@@ -50,16 +50,18 @@ 
 	}
 
 	public function getProperty($name) {
-		if (array_key_exists($name, $this->properties))
-			return $this->properties [$name];
+		if (array_key_exists($name, $this->properties)) {
+					return $this->properties [$name];
+		}
 	}
 
 	public function addToProperty($name, $value, $separator=" ") {
 		$v=@$this->properties[$name];
-		if (isset($v)&&$v!=="")
-			$v=$v.$separator.$value;
-		else
-			$v=$value;
+		if (isset($v)&&$v!=="") {
+					$v=$v.$separator.$value;
+		} else {
+					$v=$value;
+		}
 
 		return $this->setProperty($name, $v);
 	}
@@ -117,8 +119,9 @@ 
 	}
 
 	protected function setPropertyCtrl($name, $value, $typeCtrl) {
-		if ($this->ctrl($name, $value, $typeCtrl)===true)
-			return $this->setProperty($name, $value);
+		if ($this->ctrl($name, $value, $typeCtrl)===true) {
+					return $this->setProperty($name, $value);
+		}
 		return $this;
 	}
 
@@ -143,8 +146,9 @@ 
 	}
 
 	protected function removeProperty($name){
-		if(\array_key_exists($name, $this->properties))
-			unset($this->properties[$name]);
+		if(\array_key_exists($name, $this->properties)) {
+					unset($this->properties[$name]);
+		}
 		return $this;
 	}
 
@@ -164,8 +168,9 @@ 
 	}
 
 	protected function addToPropertyUnique($name, $value, $typeCtrl) {
-		if (@class_exists($typeCtrl, true))
-			$typeCtrl=$typeCtrl::getConstants();
+		if (@class_exists($typeCtrl, true)) {
+					$typeCtrl=$typeCtrl::getConstants();
+		}
 		if (is_array($typeCtrl)) {
 			$this->removeOldValues($this->properties [$name], $typeCtrl);
 		}
@@ -348,15 +353,18 @@ 
 			$flag=false;
 			$index=0;
 			while ( !$flag&&$index<sizeof($elements) ) {
-				if ($elements [$index] instanceof BaseHtml)
-					$flag=($elements [$index]->getIdentifier()===$identifier);
+				if ($elements [$index] instanceof BaseHtml) {
+									$flag=($elements [$index]->getIdentifier()===$identifier);
+				}
 				$index++;
 			}
-			if ($flag===true)
-				return $elements [$index-1];
+			if ($flag===true) {
+							return $elements [$index-1];
+			}
 		} elseif ($elements instanceof BaseHtml) {
-			if ($elements->getIdentifier()===$identifier)
-				return $elements;
+			if ($elements->getIdentifier()===$identifier) {
+							return $elements;
+			}
 		}
 		return null;
 	}

Doc Comments +36 added lines

@@ -109,6 +109,10 @@ 
 		return true;
 	}
 
+	/**
+	 * @param string $propertyName
+	 * @param string $value
+	 */
 	protected function propertyContains($propertyName,$value){
 		$values=$this->getProperty($propertyName);
 		if(isset($values)){
@@ -138,17 +142,28 @@ 
 		return $this;
 	}
 
+	/**
+	 * @param string $name
+	 * @param string $value
+	 */
 	protected function removePropertyValue($name,$value){
 		$this->properties[$name]=\str_replace($value, "", $this->properties[$name]);
 		return $this;
 	}
 
+	/**
+	 * @param string $name
+	 */
 	protected function removeProperty($name){
 		if(\array_key_exists($name, $this->properties))
 			unset($this->properties[$name]);
 		return $this;
 	}
 
+	/**
+	 * @param string $name
+	 * @param string[] $typeCtrl
+	 */
 	protected function addToMemberCtrl(&$name, $value, $typeCtrl, $separator=" ") {
 		if ($this->ctrl($name, $value, $typeCtrl)===true) {
 			if (is_array($typeCtrl)) {
@@ -173,6 +188,9 @@ 
 		return $this->addToProperty($name, $value);
 	}
 
+	/**
+	 * @param string $name
+	 */
 	public function addToPropertyCtrl($name, $value, $typeCtrl) {
 		// if($this->ctrl($name, $value, $typeCtrl)===true){
 		return $this->addToPropertyUnique($name, $value, $typeCtrl);
@@ -312,6 +330,9 @@ 
 		}
 	}
 
+	/**
+	 * @param string $operation
+	 */
 	public function _ajaxOn($operation, $event, $url, $responseElement="", $parameters=array()) {
 		$params=array (
 				"url" => $url,
@@ -322,14 +343,23 @@ 
 		return $this;
 	}
 
+	/**
+	 * @param string $event
+	 */
 	public function getOn($event, $url, $responseElement="", $parameters=array()) {
 		return $this->_ajaxOn("get", $event, $url, $responseElement, $parameters);
 	}
 
+	/**
+	 * @param string $url
+	 */
 	public function getOnClick($url, $responseElement="", $parameters=array()) {
 		return $this->getOn("click", $url, $responseElement, $parameters);
 	}
 
+	/**
+	 * @param string $event
+	 */
 	public function postOn($event, $url, $params="{}", $responseElement="", $parameters=array()) {
 		$parameters ["params"]=$params;
 		return $this->_ajaxOn("post", $event, $url, $responseElement, $parameters);
@@ -339,6 +369,9 @@ 
 		return $this->postOn("click", $url, $params, $responseElement, $parameters);
 	}
 
+	/**
+	 * @param string $event
+	 */
 	public function postFormOn($event, $url, $form, $responseElement="", $parameters=array()) {
 		$parameters ["form"]=$form;
 		return $this->_ajaxOn("postForm", $event, $url, $responseElement, $parameters);
@@ -388,6 +421,9 @@ 
 		return $value;
 	}
 
+	/**
+	 * @param string $jqueryCall
+	 */
 	public function jsDoJquery($jqueryCall, $param=""){
 		return "$('#".$this->identifier."').".$jqueryCall."(".$this->_prep_value($param).");";
 	}

Spacing +40 added lines, -40 removed lines

@@ -17,8 +17,8 @@ 
 abstract class BaseHtml extends BaseWidget {
 	protected $_template;
 	protected $tagName;
-	protected $properties=array ();
-	protected $_events=array ();
+	protected $properties=array();
+	protected $_events=array();
 	protected $_wrapBefore=array();
 	protected $_wrapAfter=array();
 	protected $_bsComponent;
@@ -57,7 +57,7 @@ 
 
 	public function addToProperty($name, $value, $separator=" ") {
 		$v=@$this->properties[$name];
-		if (isset($v)&&$v!=="")
+		if (isset($v) && $v!=="")
 			$v=$v.$separator.$value;
 		else
 			$v=$value;
@@ -72,11 +72,11 @@ 
 
 	public function compile(JsUtils $js=NULL, View $view=NULL) {
 		$result=$this->getTemplate($js);
-		foreach ( $this as $key => $value ) {
-			if (PhalconUtils::startsWith($key, "_")===false&&$key!=="events") {
+		foreach ($this as $key => $value) {
+			if (PhalconUtils::startsWith($key, "_")===false && $key!=="events") {
 				if (is_array($value)) {
 					$v=PropertyWrapper::wrap($value, $js);
-				} else {
+				}else {
 					$v=$value;
 				}
 				$result=str_ireplace("%".$key."%", $v, $result);
@@ -88,7 +88,7 @@ 
 		if (isset($view)===true) {
 			$controls=$view->getVar("q");
 			if (isset($controls)===false) {
-				$controls=array ();
+				$controls=array();
 			}
 			$controls [$this->identifier]=$result;
 			$view->setVar("q", $controls);
@@ -101,7 +101,7 @@ 
 			if (array_search($value, $typeCtrl)===false) {
 				throw new \Exception("La valeur passée a propriété `".$name."` ne fait pas partie des valeurs possibles : {".implode(",", $typeCtrl)."}");
 			}
-		} else {
+		}else {
 			if (!$typeCtrl($value)) {
 				throw new \Exception("La fonction ".$typeCtrl." a retourné faux pour l'affectation de la propriété ".$name);
 			}
@@ -109,9 +109,9 @@ 
 		return true;
 	}
 
-	protected function propertyContains($propertyName,$value){
+	protected function propertyContains($propertyName, $value) {
 		$values=$this->getProperty($propertyName);
-		if(isset($values)){
+		if (isset($values)) {
 			return JString::contains($values, $value);
 		}
 		return false;
@@ -138,13 +138,13 @@ 
 		return $this;
 	}
 
-	protected function removePropertyValue($name,$value){
+	protected function removePropertyValue($name, $value) {
 		$this->properties[$name]=\str_replace($value, "", $this->properties[$name]);
 		return $this;
 	}
 
-	protected function removeProperty($name){
-		if(\array_key_exists($name, $this->properties))
+	protected function removeProperty($name) {
+		if (\array_key_exists($name, $this->properties))
 			unset($this->properties[$name]);
 		return $this;
 	}
@@ -201,28 +201,28 @@ 
 	}
 
 	public function fromArray($array) {
-		foreach ( $this as $key => $value ) {
+		foreach ($this as $key => $value) {
 			if (array_key_exists($key, $array) && !PhalconUtils::startsWith($key, "_")) {
 					$setter="set".ucfirst($key);
 					$this->$setter($array [$key]);
 				unset($array [$key]);
 			}
 		}
-		foreach ( $array as $key => $value ) {
+		foreach ($array as $key => $value) {
 			if (method_exists($this, $key)) {
 				try {
 					$this->$key($value);
 					unset($array [$key]);
-				} catch ( \Exception $e ) {
+				} catch (\Exception $e) {
 					// Nothing to do
 				}
-			} else {
+			}else {
 				$setter="set".ucfirst($key);
 				if (method_exists($this, $setter)) {
 					try {
 						$this->$setter($value);
 						unset($array [$key]);
-					} catch ( \Exception $e ) {
+					} catch (\Exception $e) {
 						// Nothing to do
 					}
 				}
@@ -231,21 +231,21 @@ 
 		return $array;
 	}
 
-	public function fromDatabaseObjects($objects,$function) {
-		if(isset($objects)){
-			foreach ($objects as $object){
-				$this->fromDatabaseObject($object,$function);
+	public function fromDatabaseObjects($objects, $function) {
+		if (isset($objects)) {
+			foreach ($objects as $object) {
+				$this->fromDatabaseObject($object, $function);
 			}
 		}
 		return $this;
 	}
 
-	public function fromDatabaseObject($object,$function){
+	public function fromDatabaseObject($object, $function) {
 
 	}
 
 	public function wrap($before, $after="") {
-		if(isset($before)){
+		if (isset($before)) {
 			$this->_wrapBefore[]=$before;
 		}
 		$this->_wrapAfter[]=$after;
@@ -266,13 +266,13 @@ 
 		if (array_key_exists($event, $this->_events)) {
 			if (is_array($this->_events [$event])) {
 				$this->_events [$event] []=$jsCode;
-			} else {
-				$this->_events [$event]=array (
+			}else {
+				$this->_events [$event]=array(
 						$this->_events [$event],
 						$jsCode
 				);
 			}
-		} else {
+		}else {
 			$this->_events [$event]=$jsCode;
 		}
 		return $this;
@@ -292,14 +292,14 @@ 
 
 	public function addEventsOnRun(JsUtils $js) {
 		if (isset($this->_bsComponent)) {
-			foreach ( $this->_events as $event => $jsCode ) {
+			foreach ($this->_events as $event => $jsCode) {
 				$code=$jsCode;
 				if (is_array($jsCode)) {
 					$code="";
-					foreach ( $jsCode as $jsC ) {
+					foreach ($jsCode as $jsC) {
 						if ($jsC instanceof AjaxCall) {
 							$code.="\n".$jsC->compile($js);
-						} else {
+						}else {
 							$code.="\n".$jsC;
 						}
 					}
@@ -313,7 +313,7 @@ 
 	}
 
 	public function _ajaxOn($operation, $event, $url, $responseElement="", $parameters=array()) {
-		$params=array (
+		$params=array(
 				"url" => $url,
 				"responseElement" => $responseElement
 		);
@@ -352,7 +352,7 @@ 
 		if (is_array($elements)) {
 			$flag=false;
 			$index=0;
-			while ( !$flag&&$index<sizeof($elements) ) {
+			while (!$flag && $index<sizeof($elements)) {
 				if ($elements [$index] instanceof BaseHtml)
 					$flag=($elements [$index]->getIdentifier()===$identifier);
 				$index++;
@@ -366,7 +366,7 @@ 
 		return null;
 	}
 
-	public function __toString(){
+	public function __toString() {
 		return $this->compile();
 	}
 
@@ -382,29 +382,29 @@ 
 		if (is_array($value)) {
 			$value=implode(",", $value);
 		}
-		if (strrpos($value, 'this')===false&&strrpos($value, 'event')===false) {
+		if (strrpos($value, 'this')===false && strrpos($value, 'event')===false) {
 			$value='"'.$value.'"';
 		}
 		return $value;
 	}
 
-	public function jsDoJquery($jqueryCall, $param=""){
+	public function jsDoJquery($jqueryCall, $param="") {
 		return "$('#".$this->identifier."').".$jqueryCall."(".$this->_prep_value($param).");";
 	}
 
-	public function executeOnRun($jsCode){
+	public function executeOnRun($jsCode) {
 		return $this->_addEvent("execute", $jsCode);
 	}
 
-	public function jsHtml($content=""){
-		return $this->jsDoJquery("html",$content);
+	public function jsHtml($content="") {
+		return $this->jsDoJquery("html", $content);
 	}
 
-	public function jsShow(){
+	public function jsShow() {
 		return $this->jsDoJquery("show");
 	}
 
-	public function jsHide(){
+	public function jsHide() {
 		return $this->jsDoJquery("hide");
 	}
 

Ajax/semantic/html/collections/HtmlBreadcrumb.php

Spacing +37 added lines, -37 removed lines

@@ -14,7 +14,7 @@ 
  * @author jc
  * @version 1.001
  */
-class HtmlBreadcrumb extends HtmlSemNavElement{
+class HtmlBreadcrumb extends HtmlSemNavElement {
 	/**
 	 * @var integer the start index for href generation
 	 */
@@ -40,13 +40,13 @@ 
 	 * @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,$items=array(),$autoActive=true,$startIndex=0,$hrefFunction=NULL){
-		parent::__construct( $identifier, "div", "ui breadcrumb");
+	public function __construct($identifier, $items=array(), $autoActive=true, $startIndex=0, $hrefFunction=NULL) {
+		parent::__construct($identifier, "div", "ui breadcrumb");
 		$this->startIndex=$startIndex;
 		$this->autoActive=$autoActive;
 		$this->_contentSeparator="<div class='divider'> / </div>";
-		$this->_hrefFunction=function ($e){return $e->getContent();};
-		if(isset($hrefFunction)){
+		$this->_hrefFunction=function($e) {return $e->getContent(); };
+		if (isset($hrefFunction)) {
 			$this->_hrefFunction=$hrefFunction;
 		}
 		$this->addItems($items);
@@ -59,23 +59,23 @@ 
 	 * @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 setActive($index=null){
-		if(!isset($index)){
+	public function setActive($index=null) {
+		if (!isset($index)) {
 			$index=sizeof($this->content)-1;
 		}
 		$activeItem=$this->content[$index];
-		$activeItem->addToProperty("class","active");
+		$activeItem->addToProperty("class", "active");
 		$activeItem->setTagName("div");
 	}
 
@@ -84,15 +84,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;
 			}
 		}
@@ -105,14 +105,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));
 		}
 	}
 
@@ -122,7 +122,7 @@ 
 	 * @return \Ajax\bootstrap\html\HtmlBreadcrumbs
 	 */
 	public function setHrefFunction($_hrefFunction) {
-		$this->_hrefFunction = $_hrefFunction;
+		$this->_hrefFunction=$_hrefFunction;
 		return $this;
 	}
 
@@ -132,7 +132,7 @@ 
 	}
 
 	public function setAutoActive($autoActive) {
-		$this->autoActive = $autoActive;
+		$this->autoActive=$autoActive;
 		return $this;
 	}
 
@@ -141,11 +141,11 @@ 
 	 * @see \Ajax\bootstrap\html\BaseHtml::compile()
 	 */
 	public function compile(JsUtils $js=NULL, View $view=NULL) {
-		if($this->autoActive){
+		if ($this->autoActive) {
 			$this->setActive();
 		}
 		$count=$this->count();
-		for($i=1;$i<$count;$i++){
+		for ($i=1; $i<$count; $i++) {
 			$this->content[$i]->wrap($this->getContentDivider($i-1));
 		}
 		return parent::compile($js, $view);
@@ -156,16 +156,16 @@ 
 	 * @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 _ajaxOn($operation, $event, $url, $responseElement="", $parameters=array()) {
-		foreach ($this->content as $element){
-			if($element->getProperty($this->attr)!=NULL)
+		foreach ($this->content as $element) {
+			if ($element->getProperty($this->attr)!=NULL)
 				$element->_ajaxOn($operation, $event, $url, $responseElement, $parameters);
 		}
 		return $this;
@@ -177,35 +177,35 @@ 
 	 */
 	protected function createItem($value) {
 		$count=$this->count();
-		$itemO=new HtmlSemDoubleElement("item-".$this->identifier."-".$count,"a","section");
-		if(\is_array($value))
+		$itemO=new HtmlSemDoubleElement("item-".$this->identifier."-".$count, "a", "section");
+		if (\is_array($value))
 			$itemO->fromArray($value);
-		else{
+		else {
 			$itemO->setContent($value);
 			$itemO->setProperty($this->attr, $this->getHref($count));
 		}
 		return $itemO;
 	}
 
-	public function addIcon($icon,$index){
+	public function addIcon($icon, $index) {
 		$item=$this->getItem($index);
-		if(isset($item)){
+		if (isset($item)) {
 			$icon=new HtmlIcon("icon-".$this->identifier, $icon);
 			$item->wrapContent($icon);
 		}
 	}
 
-	public function addItem($item){
+	public function addItem($item) {
 		$itemO=parent::addItem($item);
 		$this->addToPropertyCtrl("class", "section", array("section"));
 		return $itemO;
 	}
 
-	public function asLinks(){
+	public function asLinks() {
 		$this->contentAs("a");
 	}
 
-	public function asTexts(){
+	public function asTexts() {
 		$this->contentAs("div");
 	}
 

Braces +10 added lines, -8 removed lines

@@ -92,8 +92,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->addItems($items);
@@ -111,7 +112,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));
 		}
 	}
@@ -165,8 +166,9 @@ 
 
 	public function _ajaxOn($operation, $event, $url, $responseElement="", $parameters=array()) {
 		foreach ($this->content as $element){
-			if($element->getProperty($this->attr)!=NULL)
-				$element->_ajaxOn($operation, $event, $url, $responseElement, $parameters);
+			if($element->getProperty($this->attr)!=NULL) {
+							$element->_ajaxOn($operation, $event, $url, $responseElement, $parameters);
+			}
 		}
 		return $this;
 	}
@@ -178,9 +180,9 @@ 
 	protected function createItem($value) {
 		$count=$this->count();
 		$itemO=new HtmlSemDoubleElement("item-".$this->identifier."-".$count,"a","section");
-		if(\is_array($value))
-			$itemO->fromArray($value);
-		else{
+		if(\is_array($value)) {
+					$itemO->fromArray($value);
+		} else{
 			$itemO->setContent($value);
 			$itemO->setProperty($this->attr, $this->getHref($count));
 		}

Doc Comments +3 added lines, -4 removed lines

@@ -57,8 +57,7 @@ 
 	 * Associate an ajax get to the breadcrumb 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
+	 * @return HtmlBreadcrumb
 	 */
 	public function autoGetOnClick($targetSelector){
 		return $this->getOnClick($this->root, $targetSelector,array("attr"=>$this->attr));
@@ -83,7 +82,7 @@ 
 	/**
 	 * Add new elements in breadcrumbs corresponding to request dispatcher : controllerName, actionName, parameters
 	 * @param Dispatcher $dispatcher the request dispatcher
-	 * @return \Ajax\bootstrap\html\HtmlBreadcrumbs
+	 * @return HtmlBreadcrumb
 	 */
 	public function fromDispatcher($dispatcher,$startIndex=0){
 		$this->startIndex=$startIndex;
@@ -120,7 +119,7 @@ 
 	/**
 	 * sets the function who generates the href elements. default : function($element){return $element->getContent()}
 	 * @param function $_hrefFunction
-	 * @return \Ajax\bootstrap\html\HtmlBreadcrumbs
+	 * @return HtmlBreadcrumb
 	 */
 	public function setHrefFunction($_hrefFunction) {
 		$this->_hrefFunction = $_hrefFunction;

Ajax/semantic/html/elements/HtmlInput.php

Spacing +22 added lines, -22 removed lines

@@ -8,53 +8,53 @@
 use Ajax\semantic\html\base\constants\Variation;
 use Ajax\semantic\html\base\traits\IconTrait;
 
-class HtmlInput extends HtmlSemDoubleElement{
+class HtmlInput extends HtmlSemDoubleElement {
 	use IconTrait;
-	public function __construct($identifier,$type="text",$value="",$placeholder=""){
-		parent::__construct("div-".$identifier,"div","ui input");
-		$this->content=new \Ajax\common\html\html5\HtmlInput($identifier,$type,$value,$placeholder);
-		$this->_states=[State::DISABLED,State::FOCUS,State::ERROR];
+	public function __construct($identifier, $type="text", $value="", $placeholder="") {
+		parent::__construct("div-".$identifier, "div", "ui input");
+		$this->content=new \Ajax\common\html\html5\HtmlInput($identifier, $type, $value, $placeholder);
+		$this->_states=[State::DISABLED, State::FOCUS, State::ERROR];
 		$this->_variations=[Variation::TRANSPARENT];
 	}
 
-	public function setFocus(){
+	public function setFocus() {
 		$this->addToProperty("class", State::FOCUS);
 	}
 
-	public function addLoading(){
-		if($this->_hasIcon===false){
+	public function addLoading() {
+		if ($this->_hasIcon===false) {
 			throw new \Exception("Input must have an icon for showing a loader, use addIcon before");
 		}
 		return $this->addToProperty("class", State::LOADING);
 	}
 
-	public function addLabel($label,$direction=Direction::LEFT,$icon=NULL){
+	public function addLabel($label, $direction=Direction::LEFT, $icon=NULL) {
 		$labelO=$label;
-		if(\is_object($label)===false){
-			$labelO=new HtmlLabel("label-".$this->identifier,$label);
-			if(isset($icon))
+		if (\is_object($label)===false) {
+			$labelO=new HtmlLabel("label-".$this->identifier, $label);
+			if (isset($icon))
 				$labelO->addIcon($icon);
-		}else{
+		}else {
 			$labelO->addToPropertyCtrl("class", "label", array("label"));
 		}
 		$this->addToProperty("class", $direction." labeled");
-		$this->addContent($labelO,\strstr($direction,Direction::LEFT)!==false);
+		$this->addContent($labelO, \strstr($direction, Direction::LEFT)!==false);
 		return $labelO;
 	}
 
-	public function addLabelToCorner($label,$direction=Direction::LEFT,$icon=NULL){
-		return $this->addLabel($label,$direction." corner",$icon)->toCorner($direction);
+	public function addLabelToCorner($label, $direction=Direction::LEFT, $icon=NULL) {
+		return $this->addLabel($label, $direction." corner", $icon)->toCorner($direction);
 	}
 
-	public function addAction($action,$direction=Direction::LEFT,$icon=NULL,$labeled=false){
+	public function addAction($action, $direction=Direction::LEFT, $icon=NULL, $labeled=false) {
 		$actionO=$action;
-		if(\is_object($action)===false){
-			$actionO=new HtmlButton("action-".$this->identifier,$action);
-			if(isset($icon))
-				$actionO->addIcon($icon,true,$labeled);
+		if (\is_object($action)===false) {
+			$actionO=new HtmlButton("action-".$this->identifier, $action);
+			if (isset($icon))
+				$actionO->addIcon($icon, true, $labeled);
 		}
 		$this->addToProperty("class", $direction." action");
-		$this->addContent($actionO,\strstr($direction,Direction::LEFT)!==false);
+		$this->addContent($actionO, \strstr($direction, Direction::LEFT)!==false);
 		return $actionO;
 	}
 

Braces +7 added lines, -5 removed lines

@@ -32,9 +32,10 @@ 
 		$labelO=$label;
 		if(\is_object($label)===false){
 			$labelO=new HtmlLabel("label-".$this->identifier,$label);
-			if(isset($icon))
-				$labelO->addIcon($icon);
-		}else{
+			if(isset($icon)) {
+							$labelO->addIcon($icon);
+			}
+		} else{
 			$labelO->addToPropertyCtrl("class", "label", array("label"));
 		}
 		$this->addToProperty("class", $direction." labeled");
@@ -50,8 +51,9 @@ 
 		$actionO=$action;
 		if(\is_object($action)===false){
 			$actionO=new HtmlButton("action-".$this->identifier,$action);
-			if(isset($icon))
-				$actionO->addIcon($icon,true,$labeled);
+			if(isset($icon)) {
+							$actionO->addIcon($icon,true,$labeled);
+			}
 		}
 		$this->addToProperty("class", $direction." action");
 		$this->addContent($actionO,\strstr($direction,Direction::LEFT)!==false);

Ajax/semantic/html/base/traits/IconTrait.php

Braces +4 added lines, -3 removed lines

@@ -16,7 +16,7 @@ 
 			$this->addToPropertyCtrl("class", $direction." icon", Direction::getConstantValues("icon"));
 			$this->addContent($iconO,false);
 			$this->_hasIcon=true;
-		}else{
+		} else{
 			$iconO=$this->getIcon();
 			$iconO->setIcon($icon);
 			$this->addToPropertyCtrl("class", $direction." icon", Direction::getConstantValues("icon"));
@@ -27,8 +27,9 @@ 
 	public function getIcon(){
 		if(\is_array($this->content)){
 			foreach ($this->content as $item){
-				if($item instanceof HtmlIcon)
-					return $item;
+				if($item instanceof HtmlIcon) {
+									return $item;
+				}
 			}
 		}
 	}

Doc Comments +7 added lines

@@ -7,9 +7,16 @@
 trait IconTrait {
 	private $_hasIcon=false;
 
+	/**
+	 * @param string $name
+	 * @param string $value
+	 */
 	protected abstract function addToPropertyCtrl($name, $value, $typeCtrl);
 	public abstract function addContent($content,$before=false);
 
+	/**
+	 * @param boolean $direction
+	 */
 	public function addIcon($icon,$direction=Direction::LEFT){
 		if($this->_hasIcon===false){
 			$iconO=$icon;

Spacing +10 added lines, -10 removed lines

@@ -8,18 +8,18 @@ 
 	private $_hasIcon=false;
 
 	protected abstract function addToPropertyCtrl($name, $value, $typeCtrl);
-	public abstract function addContent($content,$before=false);
+	public abstract function addContent($content, $before=false);
 
-	public function addIcon($icon,$direction=Direction::LEFT){
-		if($this->_hasIcon===false){
+	public function addIcon($icon, $direction=Direction::LEFT) {
+		if ($this->_hasIcon===false) {
 			$iconO=$icon;
-			if(\is_string($icon)){
+			if (\is_string($icon)) {
 				$iconO=new HtmlIcon("icon-".$this->identifier, $icon);
 			}
 			$this->addToPropertyCtrl("class", $direction." icon", Direction::getConstantValues("icon"));
-			$this->addContent($iconO,false);
+			$this->addContent($iconO, false);
 			$this->_hasIcon=true;
-		}else{
+		}else {
 			$iconO=$this->getIcon();
 			$iconO->setIcon($icon);
 			$this->addToPropertyCtrl("class", $direction." icon", Direction::getConstantValues("icon"));
@@ -27,10 +27,10 @@ 
 		return $iconO;
 	}
 
-	public function getIcon(){
-		if(\is_array($this->content)){
-			foreach ($this->content as $item){
-				if($item instanceof HtmlIcon)
+	public function getIcon() {
+		if (\is_array($this->content)) {
+			foreach ($this->content as $item) {
+				if ($item instanceof HtmlIcon)
 					return $item;
 			}
 		}

Ajax/semantic/html/base/constants/Emphasis.php

Spacing +1 added lines, -1 removed lines

@@ -5,5 +5,5 @@
 use Ajax\common\BaseEnum;
 
 abstract class Emphasis extends BaseEnum {
-	const PRIMARY="primary",SECONDARY="secondary",TERTIARY="tertiary";
+	const PRIMARY="primary", SECONDARY="secondary", TERTIARY="tertiary";
 }
\ No newline at end of file

Ajax/semantic/html/base/HtmlSemNavElement.php

Spacing +20 added lines, -20 removed lines

@@ -22,8 +22,8 @@ 
 	protected $_contentSeparator="";
 
 
-	public function __construct($identifier,$tagName,$baseClass){
-		parent::__construct($identifier,$tagName,$baseClass);
+	public function __construct($identifier, $tagName, $baseClass) {
+		parent::__construct($identifier, $tagName, $baseClass);
 		$this->root="";
 		$this->attr="data-ajax";
 	}
@@ -35,11 +35,11 @@ 
 	 * @param string $attr the html attribute used to build the elements url
 	 * @return HtmlNavElement
 	 */
-	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(){
+	public function contentAsString() {
 		return JArray::implode($this->_contentSeparator, $this->content);
 	}
 
@@ -47,15 +47,15 @@ 
 	 * Generate the jquery script to set the elements to the HtmlNavElement
 	 * @param JsUtils $jsUtils
 	 */
-	public function jsSetContent(JsUtils $jsUtils){
-		$jsUtils->html("#".$this->identifier,str_replace("\"","'", $this->contentAsString()),true);
+	public function jsSetContent(JsUtils $jsUtils) {
+		$jsUtils->html("#".$this->identifier, str_replace("\"", "'", $this->contentAsString()), true);
 	}
 
 	public function getRoot() {
 		return $this->root;
 	}
 	public function setRoot($root) {
-		$this->root = $root;
+		$this->root=$root;
 		return $this;
 	}
 	public function getAttr() {
@@ -68,12 +68,12 @@ 
 	 * @return HtmlNavElement
 	 */
 	public function setAttr($attr) {
-		$this->attr = $attr;
+		$this->attr=$attr;
 		return $this;
 	}
 
 	public function __call($method, $args) {
-		if(isset($this->$method) && is_callable($this->$method)) {
+		if (isset($this->$method) && is_callable($this->$method)) {
 			return call_user_func_array(
 					$this->$method,
 					$args
@@ -81,32 +81,32 @@ 
 		}
 	}
 
-	public abstract function fromDispatcher($dispatcher,$startIndex=0);
+	public abstract function fromDispatcher($dispatcher, $startIndex=0);
 
 
-	public function setContentDivider($divider,$index=NULL) {
+	public function setContentDivider($divider, $index=NULL) {
 		$divider="<div class='divider'> {$divider} </div>";
 		return $this->setDivider($divider, $index);
 	}
 
-	public function setIconContentDivider($iconContentDivider,$index=NULL) {
+	public function setIconContentDivider($iconContentDivider, $index=NULL) {
 		$contentDivider="<i class='".$iconContentDivider." icon divider'></i>";
 		return $this->setDivider($contentDivider, $index);
 	}
 
-	protected function setDivider($divider,$index){
-		if(isset($index)){
-			if(\is_array($this->_contentSeparator)===false)
-				$this->_contentSeparator=array_fill (0, $this->count()-1,$this->_contentSeparator);
+	protected function setDivider($divider, $index) {
+		if (isset($index)) {
+			if (\is_array($this->_contentSeparator)===false)
+				$this->_contentSeparator=array_fill(0, $this->count()-1, $this->_contentSeparator);
 			$this->_contentSeparator[$index]=$divider;
-		}else{
+		}else {
 			$this->_contentSeparator=$divider;
 		}
 		return $this;
 	}
 
-	protected function getContentDivider($index){
-		if(\is_array($this->_contentSeparator)===true){
+	protected function getContentDivider($index) {
+		if (\is_array($this->_contentSeparator)===true) {
 			return @$this->_contentSeparator[$index];
 		}
 		return $this->_contentSeparator;

Braces +4 added lines, -3 removed lines

@@ -96,10 +96,11 @@
 
 	protected function setDivider($divider,$index){
 		if(isset($index)){
-			if(\is_array($this->_contentSeparator)===false)
-				$this->_contentSeparator=array_fill (0, $this->count()-1,$this->_contentSeparator);
+			if(\is_array($this->_contentSeparator)===false) {
+							$this->_contentSeparator=array_fill (0, $this->count()-1,$this->_contentSeparator);
+			}
 			$this->_contentSeparator[$index]=$divider;
-		}else{
+		} else{
 			$this->_contentSeparator=$divider;
 		}
 		return $this;

Doc Comments +10 added lines, -2 removed lines

@@ -22,6 +22,11 @@ 
 	protected $_contentSeparator="";
 
 
+	/**
+	 * @param string $identifier
+	 * @param string $tagName
+	 * @param string $baseClass
+	 */
 	public function __construct($identifier,$tagName,$baseClass){
 		parent::__construct($identifier,$tagName,$baseClass);
 		$this->root="";
@@ -31,7 +36,7 @@ 
 	/**
 	 * Associate an ajax get to the elements, displayed in $targetSelector
 	 * @param string $targetSelector the target of the get
-	 * @return HtmlNavElement
+	 * @return HtmlSemNavElement
 	 */
 	public function autoGetOnClick($targetSelector){
 		return $this->getOnClick($this->root, $targetSelector,array("attr"=>$this->attr));
@@ -63,7 +68,7 @@ 
 	/**
 	 * Define the html attribute for each element url in ajax
 	 * @param string $attr html attribute
-	 * @return HtmlNavElement
+	 * @return HtmlSemNavElement
 	 */
 	public function setAttr($attr) {
 		$this->attr = $attr;
@@ -103,6 +108,9 @@ 
 		return $this;
 	}
 
+	/**
+	 * @param integer $index
+	 */
 	protected function getContentDivider($index){
 		if(\is_array($this->_contentSeparator)===true){
 			return @$this->_contentSeparator[$index];

Ajax/service/JArray.php

Braces +7 added lines, -5 removed lines

@@ -13,15 +13,17 @@ 
 			return $array [$key];
 		}
 		$values=array_values($array);
-		if ($pos<sizeof($values))
-			return $values [$pos];
+		if ($pos<sizeof($values)) {
+					return $values [$pos];
+		}
 	}
 
 	public static function getDefaultValue($array, $key, $default) {
 		if (array_key_exists($key, $array)) {
 			return $array [$key];
-		} else
-			return $default;
+		} else {
+					return $default;
+		}
 	}
 
 	public static function implode($glue,$pieces){
@@ -34,7 +36,7 @@ 
 				}
 				$result.=$pieces[$size-1];
 			}
-		}else{
+		} else{
 			$result=\implode($glue, $pieces);
 		}
 		return $result;

Spacing +7 added lines, -7 removed lines

@@ -5,7 +5,7 @@ 
 class JArray {
 
 	public static function isAssociative($array) {
-		return (array_values($array) !== $array);
+		return (array_values($array)!==$array);
 		//return (array_keys($array)!==range(0, count($array)-1));
 	}
 
@@ -21,21 +21,21 @@ 
 	public static function getDefaultValue($array, $key, $default) {
 		if (array_key_exists($key, $array)) {
 			return $array [$key];
-		} else
+		}else
 			return $default;
 	}
 
-	public static function implode($glue,$pieces){
+	public static function implode($glue, $pieces) {
 		$result="";
-		if(\is_array($glue)){
+		if (\is_array($glue)) {
 			$size=\sizeof($pieces);
-			if($size>0){
-				for($i=0;$i<$size-1;$i++){
+			if ($size>0) {
+				for ($i=0; $i<$size-1; $i++) {
 					$result.=$pieces[$i].@$glue[$i];
 				}
 				$result.=$pieces[$size-1];
 			}
-		}else{
+		}else {
 			$result=\implode($glue, $pieces);
 		}
 		return $result;

Ajax/semantic/html/base/traits/LabeledIconTrait.php

Spacing +5 added lines, -5 removed lines

@@ -13,17 +13,17 @@
 	 * @param boolean $labeled
 	 * @return \Ajax\semantic\html\elements\HtmlIcon
 	 */
-	public function addIcon($icon,$before=true,$labeled=false){
+	public function addIcon($icon, $before=true, $labeled=false) {
 		$iconO=$icon;
-		if(\is_string($icon)){
+		if (\is_string($icon)) {
 			$iconO=new HtmlIcon("icon-".$this->identifier, $icon);
 		}
-		if($labeled!==false){
-			$direction=($before===true)?Direction::LEFT:Direction::RIGHT;
+		if ($labeled!==false) {
+			$direction=($before===true) ? Direction::LEFT : Direction::RIGHT;
 			$this->addToProperty("class", $direction." labeled icon");
 			$this->tagName="div";
 		}
-		$this->addContent($iconO,$before);
+		$this->addContent($iconO, $before);
 		return $iconO;
 	}
 }
\ No newline at end of file