jcheron / phalcon-jquery

Ajax/semantic/html/collections/form/HtmlForm.php

Spacing +33 added lines, -33 removed lines

@@ -13,62 +13,62 @@ 
  * @author jc
  * @version 1.001
  */
-class HtmlForm extends HtmlSemCollection{
+class HtmlForm extends HtmlSemCollection {
 
 	use FieldsTrait;
 
 	protected $_fields;
 
-	public function __construct( $identifier, $elements=array()){
-		parent::__construct( $identifier, "form", "ui form");
-		$this->_states=[State::ERROR,State::SUCCESS,State::WARNING,State::DISABLED];
+	public function __construct($identifier, $elements=array()) {
+		parent::__construct($identifier, "form", "ui form");
+		$this->_states=[State::ERROR, State::SUCCESS, State::WARNING, State::DISABLED];
 		$this->setProperty("name", $this->identifier);
 		$this->_fields=array();
 		$this->addItems($elements);
 	}
 
-	public function addHeader($title,$niveau=1,$dividing=true){
-		$header=new HtmlHeader("",$niveau,$title);
-		if($dividing)
+	public function addHeader($title, $niveau=1, $dividing=true) {
+		$header=new HtmlHeader("", $niveau, $title);
+		if ($dividing)
 			$header->setDividing();
 		return $this->addItem($header);
 	}
 
-	public function addFields($fields=NULL,$label=NULL){
-		if(isset($fields)){
-			if(!$fields instanceof HtmlFormFields){
-				if(\is_array($fields)===false){
-					$fields = \func_get_args();
+	public function addFields($fields=NULL, $label=NULL) {
+		if (isset($fields)) {
+			if (!$fields instanceof HtmlFormFields) {
+				if (\is_array($fields)===false) {
+					$fields=\func_get_args();
 					$end=\end($fields);
-					if(\is_string($end)){
+					if (\is_string($end)) {
 						$label=$end;
 						\array_pop($fields);
 					}else $label=NULL;
 				}
-				$this->_fields=\array_merge($this->_fields,$fields);
-				$fields=new HtmlFormFields("fields-".$this->identifier."-".$this->count(),$fields);
+				$this->_fields=\array_merge($this->_fields, $fields);
+				$fields=new HtmlFormFields("fields-".$this->identifier."-".$this->count(), $fields);
 			}
-			if(isset($label))
-			 $fields=new HtmlFormField("", $fields,$label);
-		}else{
+			if (isset($label))
+			 $fields=new HtmlFormField("", $fields, $label);
+		}else {
 			$fields=new HtmlFormFields("fields-".$this->identifier."-".$this->count());
 		}
 		$this->addItem($fields);
 		return $fields;
 	}
 
-	public function addItem($item){
+	public function addItem($item) {
 		$item=parent::addItem($item);
-		if(\is_subclass_of($item, HtmlFormField::class)===true){
+		if (\is_subclass_of($item, HtmlFormField::class)===true) {
 			$this->_fields[]=$item;
 		}
 		return $item;
 	}
 
-	public function getField($index){
-		if(\is_string($index)){
+	public function getField($index) {
+		if (\is_string($index)) {
 			$field=$this->getElementById($index, $this->_fields);
-		}else{
+		}else {
 			$field=$this->_fields[$index];
 		}
 		return $field;
@@ -78,7 +78,7 @@ 
 	 * automatically divide fields to be equal width
 	 * @return \Ajax\semantic\html\collections\form\HtmlForm
 	 */
-	public function setEqualWidth(){
+	public function setEqualWidth() {
 		return $this->addToProperty("class", "equal width");
 	}
 
@@ -87,7 +87,7 @@ 
 	 * @param HtmlFormField $field
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
-	public function addField($field){
+	public function addField($field) {
 		return $this->addItem($field);
 	}
 
@@ -99,22 +99,22 @@ 
 	 * @param string $type
 	 * @return \Ajax\semantic\html\collections\HtmlMessage
 	 */
-	public function addMessage($identifier,$content,$header=NULL,$icon=NULL,$type=NULL){
-		$message=new HtmlMessage($identifier,$content);
-		if(isset($header))
+	public function addMessage($identifier, $content, $header=NULL, $icon=NULL, $type=NULL) {
+		$message=new HtmlMessage($identifier, $content);
+		if (isset($header))
 			$message->addHeader($header);
-		if(isset($icon))
+		if (isset($icon))
 			$message->setIcon($icon);
-		if(isset($type))
+		if (isset($type))
 			$message->setStyle($type);
 		return $this->addItem($message);
 	}
 
-	public function setLoading(){
+	public function setLoading() {
 		return $this->addToProperty("class", "loading");
 	}
 
-	public function jsState($state){
-		return $this->jsDoJquery("addClass",$state);
+	public function jsState($state) {
+		return $this->jsDoJquery("addClass", $state);
 	}
 }
\ No newline at end of file

Braces +20 added lines, -13 removed lines

@@ -29,8 +29,9 @@ 
 
 	public function addHeader($title,$niveau=1,$dividing=true){
 		$header=new HtmlHeader("",$niveau,$title);
-		if($dividing)
-			$header->setDividing();
+		if($dividing) {
+					$header->setDividing();
+		}
 		return $this->addItem($header);
 	}
 
@@ -43,14 +44,17 @@ 
 					if(\is_string($end)){
 						$label=$end;
 						\array_pop($fields);
-					}else $label=NULL;
+					} else {
+						$label=NULL;
+					}
 				}
 				$this->_fields=\array_merge($this->_fields,$fields);
 				$fields=new HtmlFormFields("fields-".$this->identifier."-".$this->count(),$fields);
 			}
-			if(isset($label))
-			 $fields=new HtmlFormField("", $fields,$label);
-		}else{
+			if(isset($label)) {
+						 $fields=new HtmlFormField("", $fields,$label);
+			}
+		} else{
 			$fields=new HtmlFormFields("fields-".$this->identifier."-".$this->count());
 		}
 		$this->addItem($fields);
@@ -68,7 +72,7 @@ 
 	public function getField($index){
 		if(\is_string($index)){
 			$field=$this->getElementById($index, $this->_fields);
-		}else{
+		} else{
 			$field=$this->_fields[$index];
 		}
 		return $field;
@@ -101,12 +105,15 @@ 
 	 */
 	public function addMessage($identifier,$content,$header=NULL,$icon=NULL,$type=NULL){
 		$message=new HtmlMessage($identifier,$content);
-		if(isset($header))
-			$message->addHeader($header);
-		if(isset($icon))
-			$message->setIcon($icon);
-		if(isset($type))
-			$message->setStyle($type);
+		if(isset($header)) {
+					$message->addHeader($header);
+		}
+		if(isset($icon)) {
+					$message->setIcon($icon);
+		}
+		if(isset($type)) {
+					$message->setStyle($type);
+		}
 		return $this->addItem($message);
 	}
 

Ajax/semantic/html/collections/form/traits/FieldsTrait.php

Braces +3 added lines, -2 removed lines

@@ -13,8 +13,9 @@
 		if(\is_array($value)){
 			$itemO=new HtmlFormInput(JArray::getDefaultValue($value, "id",""),JArray::getDefaultValue($value, "label",null),JArray::getDefaultValue($value, "type", "text"),JArray::getDefaultValue($value, "value",""),JArray::getDefaultValue($value, "placeholder",JArray::getDefaultValue($value, "label",null)));
 			return $itemO;
-		}else
-			return new HtmlFormInput($value);
+		} else {
+					return new HtmlFormInput($value);
+		}
 	}
 
 	public function addInputs($inputs,$fieldslabel=null){

Spacing +18 added lines, -18 removed lines

@@ -9,26 +9,26 @@ 
 use Ajax\semantic\html\collections\form\HtmlFormCheckbox;
 use Ajax\semantic\html\collections\form\HtmlFormRadio;
 trait FieldsTrait {
-	public abstract function addFields($fields=NULL,$label=NULL);
+	public abstract function addFields($fields=NULL, $label=NULL);
 	public abstract function addItem($item);
 
-	protected function createItem($value){
-		if(\is_array($value)){
-			$itemO=new HtmlFormInput(JArray::getDefaultValue($value, "id",""),JArray::getDefaultValue($value, "label",null),JArray::getDefaultValue($value, "type", "text"),JArray::getDefaultValue($value, "value",""),JArray::getDefaultValue($value, "placeholder",JArray::getDefaultValue($value, "label",null)));
+	protected function createItem($value) {
+		if (\is_array($value)) {
+			$itemO=new HtmlFormInput(JArray::getDefaultValue($value, "id", ""), JArray::getDefaultValue($value, "label", null), JArray::getDefaultValue($value, "type", "text"), JArray::getDefaultValue($value, "value", ""), JArray::getDefaultValue($value, "placeholder", JArray::getDefaultValue($value, "label", null)));
 			return $itemO;
 		}else
 			return new HtmlFormInput($value);
 	}
 
-	public function addInputs($inputs,$fieldslabel=null){
+	public function addInputs($inputs, $fieldslabel=null) {
 		$fields=array();
-		foreach ($inputs as $input){
+		foreach ($inputs as $input) {
 			\extract($input);
-			$f=new HtmlFormInput("","");
+			$f=new HtmlFormInput("", "");
 			$f->fromArray($input);
 			$fields[]=$f;
 		}
-		return $this->addFields($fields,$fieldslabel);
+		return $this->addFields($fields, $fieldslabel);
 	}
 
 	/**
@@ -39,23 +39,23 @@ 
 	 * @param boolean $multiple
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
-	public function addDropdown($identifier,$items=array(), $label=NULL,$value=NULL,$multiple=false){
-		return $this->addItem(new HtmlFormDropdown($identifier,$items,$label,$value,$multiple));
+	public function addDropdown($identifier, $items=array(), $label=NULL, $value=NULL, $multiple=false) {
+		return $this->addItem(new HtmlFormDropdown($identifier, $items, $label, $value, $multiple));
 	}
 
-	public function addInput($identifier, $label=NULL,$type="text",$value=NULL,$placeholder=NULL){
-		return $this->addItem(new HtmlFormInput($identifier,$label,$type,$value,$placeholder));
+	public function addInput($identifier, $label=NULL, $type="text", $value=NULL, $placeholder=NULL) {
+		return $this->addItem(new HtmlFormInput($identifier, $label, $type, $value, $placeholder));
 	}
 
-	public function addButton($identifier,$value,$cssStyle=NULL,$onClick=NULL){
-		return $this->addItem(new HtmlButton($identifier,$value,$cssStyle,$onClick));
+	public function addButton($identifier, $value, $cssStyle=NULL, $onClick=NULL) {
+		return $this->addItem(new HtmlButton($identifier, $value, $cssStyle, $onClick));
 	}
 
-	public function addCheckbox($identifier, $label=NULL,$value=NULL,$type=NULL){
-		return $this->addItem(new HtmlFormCheckbox($identifier,$label,$value,$type));
+	public function addCheckbox($identifier, $label=NULL, $value=NULL, $type=NULL) {
+		return $this->addItem(new HtmlFormCheckbox($identifier, $label, $value, $type));
 	}
 
-	public function addRadio($identifier, $name,$label=NULL,$value=NULL){
-		return $this->addItem(new HtmlFormRadio($identifier,$name,$label,$value));
+	public function addRadio($identifier, $name, $label=NULL, $value=NULL) {
+		return $this->addItem(new HtmlFormRadio($identifier, $name, $label, $value));
 	}
 }
\ No newline at end of file

Ajax/semantic/html/collections/form/traits/TextFieldsTrait.php

Spacing +2 added lines, -2 removed lines

@@ -3,11 +3,11 @@
 namespace Ajax\semantic\html\collections\form;
 
 trait TextFieldsTrait {
-	public function setPlaceholder($value){
+	public function setPlaceholder($value) {
 		return $this->getField()->setPlaceholder($value);
 	}
 
-	public function setValue($value){
+	public function setValue($value) {
 		return $this->getField()->setValue($value);
 	}
 }
\ No newline at end of file

Ajax/semantic/traits/SemanticHtmlElementsTrait.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 +29 added lines, -29 removed lines

@@ -42,8 +42,8 @@ 
 	 * @param boolean $asIcons
 	 * @return HtmlButtonGroups
 	 */
-	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));
 	}
 
 	/**
@@ -52,7 +52,7 @@ 
 	 * @param string $content
 	 * @return HtmlContainer
 	 */
-	public function htmlContainer($identifier,$content=""){
+	public function htmlContainer($identifier, $content="") {
 		return $this->addHtmlComponent(new HtmlContainer($identifier, $content));
 	}
 
@@ -61,8 +61,8 @@ 
 	 * @param string $content
 	 * @return HtmlDivider
 	 */
-	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));
 	}
 
 	/**
@@ -72,8 +72,8 @@ 
 	 * @param string $type
 	 * @return HtmlHeader
 	 */
-	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));
 	}
 
 	/**
@@ -81,7 +81,7 @@ 
 	 * @param string $icon
 	 * @return HtmlIcon
 	 */
-	public function htmlIcon($identifier,$icon){
+	public function htmlIcon($identifier, $icon) {
 		return $this->addHtmlComponent(new HtmlIcon($identifier, $icon));
 	}
 
@@ -91,14 +91,14 @@ 
 	 * @param array $icons
 	 * @return HtmlIconGroups
 	 */
-	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);
 			}
 		}
@@ -113,8 +113,8 @@ 
 	 * @param string $placeholder
 	 * @return HtmlInput
 	 */
-	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));
 	}
 
 	/**
@@ -123,8 +123,8 @@ 
 	 * @param string $tagName
 	 * @return HtmlLabel
 	 */
-	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));
 	}
 
 	/**
@@ -133,8 +133,8 @@ 
 	 * @param array $items
 	 * @return HtmlList
 	 */
-	public function htmlList($identifier,$items=array()){
-		return $this->addHtmlComponent(new HtmlList($identifier,$items));
+	public function htmlList($identifier, $items=array()) {
+		return $this->addHtmlComponent(new HtmlList($identifier, $items));
 	}
 
 	/**
@@ -143,8 +143,8 @@ 
 	 * @param string $content
 	 * @return HtmlSegment
 	 */
-	public function htmlSegment($identifier, $content=""){
-		return $this->addHtmlComponent(new HtmlSegment($identifier,$content));
+	public function htmlSegment($identifier, $content="") {
+		return $this->addHtmlComponent(new HtmlSegment($identifier, $content));
 	}
 
 	/**
@@ -153,8 +153,8 @@ 
 	 * @param array $items the segments
 	 * @return HtmlSegmentGroups
 	 */
-	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));
 	}
 
 	/**
@@ -164,11 +164,11 @@ 
 	 * @param RevealType|string $type
 	 * @param Direction|string $attributeType
 	 */
-	public function htmlReveal($identifier, $visibleContent,$hiddenContent,$type=RevealType::FADE,$attributeType=NULL){
-		return $this->addHtmlComponent(new HtmlReveal($identifier,$visibleContent,$hiddenContent,$type,$attributeType));
+	public function htmlReveal($identifier, $visibleContent, $hiddenContent, $type=RevealType::FADE, $attributeType=NULL) {
+		return $this->addHtmlComponent(new HtmlReveal($identifier, $visibleContent, $hiddenContent, $type, $attributeType));
 	}
 
-	public function htmlStep($identifier, $steps=array()){
-		return $this->addHtmlComponent(new HtmlStep($identifier,$steps));
+	public function htmlStep($identifier, $steps=array()) {
+		return $this->addHtmlComponent(new HtmlStep($identifier, $steps));
 	}
 }
\ No newline at end of file

Ajax/common/traits/JqueryEventsTrait.php

Doc Comments +9 added lines

@@ -3,7 +3,16 @@
 namespace Ajax\common\traits;
 
 trait JqueryEventsTrait {
+
+	/**
+	 * @param string $element
+	 */
 	public abstract function _prep_element($element);
+
+	/**
+	 * @param string $element
+	 * @param string $event
+	 */
 	public abstract function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false,$immediatly=true);
 
 	/**

Spacing +2 added lines, -2 removed lines

@@ -4,7 +4,7 @@ 
 
 trait JqueryEventsTrait {
 	public abstract function _prep_element($element);
-	public abstract function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false,$immediatly=true);
+	public abstract function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false, $immediatly=true);
 
 	/**
 	 * Blur
@@ -46,7 +46,7 @@ 
 	 */
 	public function _click($element='this', $js=array(), $ret_false=TRUE) {
 		if (!is_array($js)) {
-			$js=array (
+			$js=array(
 					$js
 			);
 		}

Ajax/semantic/html/modules/HtmlDropdown.php

Doc Comments +7 added lines, -1 removed lines

@@ -21,6 +21,9 @@ 
 	protected $params=array("action"=>"nothing","on"=>"hover");
 	protected $input;
 
+	/**
+	 * @param string $identifier
+	 */
 	public function __construct($identifier, $value="", $items=array()) {
 		parent::__construct($identifier, "div");
 		$this->_template=include dirname(__FILE__).'/../templates/tplDropdown.php';
@@ -47,7 +50,7 @@ 
 	/**
 	 * Insert an item at a position
 	 * @param mixed $item
-	 * @param number $position
+	 * @param integer $position
 	 * @return \Ajax\semantic\html\content\HtmlDropdownItem|unknown
 	 */
 	public function insertItem($item,$position=0){
@@ -196,6 +199,9 @@ 
 		}
 	}
 
+	/**
+	 * @param string $action
+	 */
 	public function setAction($action){
 		$this->params["action"]=$action;
 	}

Spacing +58 added lines, -58 removed lines

@@ -17,31 +17,31 @@ 
 	}
 	protected $mClass="menu";
 	protected $mTagName="div";
-	protected $items=array ();
-	protected $_params=array("action"=>"nothing","on"=>"hover");
+	protected $items=array();
+	protected $_params=array("action"=>"nothing", "on"=>"hover");
 	protected $input;
 
 	public function __construct($identifier, $value="", $items=array()) {
 		parent::__construct($identifier, "div");
 		$this->_template=include dirname(__FILE__).'/../templates/tplDropdown.php';
 		$this->setProperty("class", "ui dropdown");
-		$content=new HtmlSemDoubleElement("text-".$this->identifier,"div");
+		$content=new HtmlSemDoubleElement("text-".$this->identifier, "div");
 		$content->setClass("text");
 		$content->setContent($value);
-		$content->wrap("",new HtmlIcon("", "dropdown"));
+		$content->wrap("", new HtmlIcon("", "dropdown"));
 		$this->content=array($content);
 		$this->tagName="div";
 		$this->addItems($items);
 	}
 
-	public function addItem($item,$value=NULL,$image=NULL){
-		$itemO=$this->beforeAddItem($item,$value,$image);
+	public function addItem($item, $value=NULL, $image=NULL) {
+		$itemO=$this->beforeAddItem($item, $value, $image);
 		$this->items[]=$itemO;
 		return $itemO;
 	}
 
-	public function addIcon($icon,$before=true,$labeled=false){
-		$this->addIconP($icon,$before,$labeled);
+	public function addIcon($icon, $before=true, $labeled=false) {
+		$this->addIconP($icon, $before, $labeled);
 		return $this->getElementById("text-".$this->identifier, $this->content)->setWrapAfter("");
 	}
 	/**
@@ -50,20 +50,20 @@ 
 	 * @param number $position
 	 * @return \Ajax\semantic\html\content\HtmlDropdownItem|unknown
 	 */
-	public function insertItem($item,$position=0){
+	public function insertItem($item, $position=0) {
 		$itemO=$this->beforeAddItem($item);
-		 $start = array_slice($this->items, 0, $position);
-		 $end = array_slice($this->items, $position);
-		 $start[] = $item;
+		 $start=array_slice($this->items, 0, $position);
+		 $end=array_slice($this->items, $position);
+		 $start[]=$item;
 		 $this->items=array_merge($start, $end);
 		 return $itemO;
 	}
 
-	protected function beforeAddItem($item,$value=NULL,$image=NULL){
+	protected function beforeAddItem($item, $value=NULL, $image=NULL) {
 		$itemO=$item;
-		if(!$item instanceof HtmlDropdownItem){
-			$itemO=new HtmlDropdownItem("dd-item-".$this->identifier."-".\sizeof($this->items),$item,$value,$image);
-		}elseif($itemO instanceof HtmlDropdownItem){
+		if (!$item instanceof HtmlDropdownItem) {
+			$itemO=new HtmlDropdownItem("dd-item-".$this->identifier."-".\sizeof($this->items), $item, $value, $image);
+		}elseif ($itemO instanceof HtmlDropdownItem) {
 			$this->addToProperty("class", "vertical");
 		}
 		return $itemO;
@@ -76,76 +76,76 @@ 
 		$this->addItem($function($object));
 	}
 
-	public function addInput($name){
-		if(!isset($name))
+	public function addInput($name) {
+		if (!isset($name))
 			$name="input-".$this->identifier;
 		$this->setAction("activate");
-		$this->input=new HtmlInput($name,"hidden");
+		$this->input=new HtmlInput($name, "hidden");
 	}
 
-	public function addItems($items){
-		if(JArray::isAssociative($items)){
-			foreach ($items as $k=>$v){
+	public function addItems($items) {
+		if (JArray::isAssociative($items)) {
+			foreach ($items as $k=>$v) {
 				$this->addItem($v)->setData($k);
 			}
-		}else{
-			foreach ($items as $item){
+		}else {
+			foreach ($items as $item) {
 				$this->addItem($item);
 			}
 		}
 	}
 
-	public function count(){
+	public function count() {
 		return \sizeof($this->items);
 	}
 	/**
 	 * @param boolean $dropdown
 	 */
-	public function asDropdown($dropdown){
-		if($dropdown===false){
+	public function asDropdown($dropdown) {
+		if ($dropdown===false) {
 			$this->_template=include dirname(__FILE__).'/../templates/tplDropdownMenu.php';
 			$dropdown="menu";
-		}else{
+		}else {
 			$dropdown="dropdown";
 			$this->mClass="menu";
 		}
-		return $this->addToPropertyCtrl("class", $dropdown,array("menu","dropdown"));
+		return $this->addToPropertyCtrl("class", $dropdown, array("menu", "dropdown"));
 	}
 
-	public function setVertical(){
-		return $this->addToPropertyCtrl("class", "vertical",array("vertical"));
+	public function setVertical() {
+		return $this->addToPropertyCtrl("class", "vertical", array("vertical"));
 	}
 
-	public function setSimple(){
-		return $this->addToPropertyCtrl("class", "simple",array("simple"));
+	public function setSimple() {
+		return $this->addToPropertyCtrl("class", "simple", array("simple"));
 	}
 
-	public function asButton($floating=false){
-		if($floating)
+	public function asButton($floating=false) {
+		if ($floating)
 			$this->addToProperty("class", "floating");
 		return $this->addToProperty("class", "button");
 	}
 
-	public function asSelect($name=NULL,$multiple=false,$selection=true){
-		if(isset($name))
+	public function asSelect($name=NULL, $multiple=false, $selection=true) {
+		if (isset($name))
 			$this->addInput($name);
-		if($multiple)
+		if ($multiple)
 			$this->addToProperty("class", "multiple");
 		if ($selection)
-			$this->addToPropertyCtrl("class", "selection",array("selection"));
+			$this->addToPropertyCtrl("class", "selection", array("selection"));
 		return $this;
 	}
 
-	public function asSearch($name=NULL,$multiple=false,$selection=false){
-		$this->asSelect($name,$multiple,$selection);
+	public function asSearch($name=NULL, $multiple=false, $selection=false) {
+		$this->asSelect($name, $multiple, $selection);
 		return $this->addToProperty("class", "search");
 	}
 
-	public function setSelect($name=NULL,$multiple=false){
-		if(!isset($name))
+	public function setSelect($name=NULL, $multiple=false) {
+		if (!isset($name))
 			$name="select-".$this->identifier;
 		$this->input=null;
-		if($multiple){
+		if ($multiple) {
 			$this->setProperty("multiple", true);
 			$this->addToProperty("class", "multiple");
 		}
@@ -153,32 +153,32 @@ 
 		$this->tagName="select";
 		$this->setProperty("name", $name);
 		$this->content=null;
-		foreach ($this->items as $item){
+		foreach ($this->items as $item) {
 			$item->asOption();
 		}
 		return $this;
 	}
 
-	public function asSubmenu($pointing=NULL){
+	public function asSubmenu($pointing=NULL) {
 		$this->setClass("ui dropdown link item");
-		if(isset($pointing)){
+		if (isset($pointing)) {
 			$this->setPointing($pointing);
 		}
 		return $this;
 	}
 
-	public function setPointing($value=Direction::NONE){
-		return $this->addToPropertyCtrl("class", $value." pointing",Direction::getConstantValues("pointing"));
+	public function setPointing($value=Direction::NONE) {
+		return $this->addToPropertyCtrl("class", $value." pointing", Direction::getConstantValues("pointing"));
 	}
 
-	public function setValue($value){
-		if(isset($this->input)){
+	public function setValue($value) {
+		if (isset($this->input)) {
 			$this->input->setProperty("value", $value);
-		}else{
+		}else {
 			$this->setProperty("value", $value);
 		}
 		$textElement=$this->getElementById("text-".$this->identifier, $this->content);
-		if(isset($textElement))
+		if (isset($textElement))
 			$textElement->setContent($value);
 		return $this;
 	}
@@ -188,19 +188,19 @@ 
 	 * @see BaseHtml::run()
 	 */
 	public function run(JsUtils $js) {
-		if($this->propertyContains("class", "simple")===false){
-			if(isset($this->_bsComponent)===false)
-				$this->_bsComponent=$js->semantic()->dropdown("#".$this->identifier,$this->_params);
+		if ($this->propertyContains("class", "simple")===false) {
+			if (isset($this->_bsComponent)===false)
+				$this->_bsComponent=$js->semantic()->dropdown("#".$this->identifier, $this->_params);
 			$this->addEventsOnRun($js);
 			return $this->_bsComponent;
 		}
 	}
 
-	public function setAction($action){
+	public function setAction($action) {
 		$this->_params["action"]=$action;
 	}
 
-	public function setFullTextSearch($value){
+	public function setFullTextSearch($value) {
 		$this->_params["fullTextSearch"]=$value;
 	}
 }
\ No newline at end of file

Braces +28 added lines, -20 removed lines

@@ -63,7 +63,7 @@ 
 		$itemO=$item;
 		if(!$item instanceof HtmlDropdownItem){
 			$itemO=new HtmlDropdownItem("dd-item-".$this->identifier."-".\sizeof($this->items),$item,$value,$image);
-		}elseif($itemO instanceof HtmlDropdownItem){
+		} elseif($itemO instanceof HtmlDropdownItem){
 			$this->addToProperty("class", "vertical");
 		}
 		return $itemO;
@@ -77,8 +77,9 @@ 
 	}
 
 	public function addInput($name){
-		if(!isset($name))
-			$name="input-".$this->identifier;
+		if(!isset($name)) {
+					$name="input-".$this->identifier;
+		}
 		$this->setAction("activate");
 		$this->input=new HtmlInput($name,"hidden");
 	}
@@ -88,7 +89,7 @@ 
 			foreach ($items as $k=>$v){
 				$this->addItem($v)->setData($k);
 			}
-		}else{
+		} else{
 			foreach ($items as $item){
 				$this->addItem($item);
 			}
@@ -105,7 +106,7 @@ 
 		if($dropdown===false){
 			$this->_template=include dirname(__FILE__).'/../templates/tplDropdownMenu.php';
 			$dropdown="menu";
-		}else{
+		} else{
 			$dropdown="dropdown";
 			$this->mClass="menu";
 		}
@@ -121,18 +122,22 @@ 
 	}
 
 	public function asButton($floating=false){
-		if($floating)
-			$this->addToProperty("class", "floating");
+		if($floating) {
+					$this->addToProperty("class", "floating");
+		}
 		return $this->addToProperty("class", "button");
 	}
 
 	public function asSelect($name=NULL,$multiple=false,$selection=true){
-		if(isset($name))
-			$this->addInput($name);
-		if($multiple)
-			$this->addToProperty("class", "multiple");
-		if ($selection)
-			$this->addToPropertyCtrl("class", "selection",array("selection"));
+		if(isset($name)) {
+					$this->addInput($name);
+		}
+		if($multiple) {
+					$this->addToProperty("class", "multiple");
+		}
+		if ($selection) {
+					$this->addToPropertyCtrl("class", "selection",array("selection"));
+		}
 		return $this;
 	}
 
@@ -142,8 +147,9 @@ 
 	}
 
 	public function setSelect($name=NULL,$multiple=false){
-		if(!isset($name))
-			$name="select-".$this->identifier;
+		if(!isset($name)) {
+					$name="select-".$this->identifier;
+		}
 		$this->input=null;
 		if($multiple){
 			$this->setProperty("multiple", true);
@@ -174,12 +180,13 @@ 
 	public function setValue($value){
 		if(isset($this->input)){
 			$this->input->setProperty("value", $value);
-		}else{
+		} else{
 			$this->setProperty("value", $value);
 		}
 		$textElement=$this->getElementById("text-".$this->identifier, $this->content);
-		if(isset($textElement))
-			$textElement->setContent($value);
+		if(isset($textElement)) {
+					$textElement->setContent($value);
+		}
 		return $this;
 	}
 
@@ -189,8 +196,9 @@ 
 	 */
 	public function run(JsUtils $js) {
 		if($this->propertyContains("class", "simple")===false){
-			if(isset($this->_bsComponent)===false)
-				$this->_bsComponent=$js->semantic()->dropdown("#".$this->identifier,$this->_params);
+			if(isset($this->_bsComponent)===false) {
+							$this->_bsComponent=$js->semantic()->dropdown("#".$this->identifier,$this->_params);
+			}
 			$this->addEventsOnRun($js);
 			return $this->_bsComponent;
 		}

Ajax/bootstrap/traits/BootstrapComponentsTrait.php

Doc Comments +3 added lines

@@ -16,6 +16,9 @@
 
 trait BootstrapComponentsTrait {
 
+	/**
+	 * @param string|null $attachTo
+	 */
 	public abstract function addComponent(SimpleComponent $component, $attachTo, $params);
 	/**
 	 *

Unused Use Statements -1 removed lines

@@ -11,7 +11,6 @@
 use Ajax\bootstrap\components\Tab;
 use Ajax\bootstrap\components\Carousel;
 use Ajax\bootstrap\components\Collapse;
-use Ajax\Bootstrap;
 use Ajax\common\components\SimpleComponent;
 
 trait BootstrapComponentsTrait {

Ajax/semantic/html/collections/menus/HtmlMenu.php

Braces +11 added lines, -9 removed lines

@@ -57,9 +57,9 @@ 
 			$item=$itemO;
 		}
 		$item=parent::addItem($item);
-		if(!$item instanceof HtmlMenu)
-			$item->addToPropertyCtrl("class", "item",array("item"));
-		else{
+		if(!$item instanceof HtmlMenu) {
+					$item->addToPropertyCtrl("class", "item",array("item"));
+		} else{
 			$this->setSecondary();
 		}
 		return $item;
@@ -129,8 +129,9 @@ 
 
 	public function asTab($vertical=false){
 		$this->apply(function(HtmlDoubleElement &$item){$item->setTagName("a");});
-		if($vertical===true)
-			$this->setVertical();
+		if($vertical===true) {
+					$this->setVertical();
+		}
 		return $this->addToProperty("class", "tabular");
 	}
 
@@ -156,10 +157,11 @@ 
 	 */
 	public function fromDatabaseObject($object, $function) {
 		$return=$function($object);
-		if(\is_array($return))
-			$this->addItems($return);
-		else
-		$this->addItem($return);
+		if(\is_array($return)) {
+					$this->addItems($return);
+		} else {
+				$this->addItem($return);
+		}
 	}
 
 	/**

Doc Comments +2 added lines, -1 removed lines

@@ -31,7 +31,7 @@ 
 	/**
 	 * Sets the menu type
 	 * @param string $type one of text,item
-	 * @return \Ajax\semantic\html\collections\HtmlMenu
+	 * @return HtmlMenu
 	 */
 	public function setType($type=""){
 		return $this->addToPropertyCtrl("class", $type, array("","item","text"));
@@ -73,6 +73,7 @@ 
 	/**
 	 * {@inheritDoc}
 	 * @see \Ajax\common\html\HtmlCollection::insertItem()
+	 * @param HtmlIcon $item
 	 */
 	public function insertItem($item,$position=0){
 		$item=parent::insertItem($this->getItemToInsert($item),$position);

Spacing +53 added lines, -53 removed lines

@@ -24,7 +24,7 @@ 
 class HtmlMenu extends HtmlSemCollection {
 
 	public function __construct($identifier, $items=array()) {
-		parent::__construct($identifier, "div","ui menu");
+		parent::__construct($identifier, "div", "ui menu");
 		$this->addItems($items);
 	}
 
@@ -33,30 +33,30 @@ 
 	 * @param string $type one of text,item
 	 * @return \Ajax\semantic\html\collections\HtmlMenu
 	 */
-	public function setType($type=""){
-		return $this->addToPropertyCtrl("class", $type, array("","item","text"));
+	public function setType($type="") {
+		return $this->addToPropertyCtrl("class", $type, array("", "item", "text"));
 	}
 
-	public function setActiveItem($index){
+	public function setActiveItem($index) {
 		$item=$this->getItem($index);
-		if($item!==null){
+		if ($item!==null) {
 			$item->addToProperty("class", "active");
 		}
 		return $this;
 	}
-	private function getItemToInsert($item){
-		if($item instanceof HtmlInput || $item instanceof HtmlImg || $item instanceof HtmlIcon){
-			$itemO=new HtmlSemDoubleElement("item-".$this->identifier,"div","");
+	private function getItemToInsert($item) {
+		if ($item instanceof HtmlInput || $item instanceof HtmlImg || $item instanceof HtmlIcon) {
+			$itemO=new HtmlSemDoubleElement("item-".$this->identifier, "div", "");
 			$itemO->setContent($item);
 			$item=$itemO;
 		}
 		return $item;
 	}
 
-	private function afterInsert($item){
-		if(!$item instanceof HtmlMenu)
-			$item->addToPropertyCtrl("class", "item",array("item"));
-		else{
+	private function afterInsert($item) {
+		if (!$item instanceof HtmlMenu)
+			$item->addToPropertyCtrl("class", "item", array("item"));
+		else {
 			$this->setSecondary();
 		}
 		return $item;
@@ -65,7 +65,7 @@ 
 	 * {@inheritDoc}
 	 * @see \Ajax\common\html\html5\HtmlCollection::addItem()
 	 */
-	public function addItem($item){
+	public function addItem($item) {
 		$item=parent::addItem($this->getItemToInsert($item));
 		return $this->afterInsert($item);
 	}
@@ -74,16 +74,16 @@ 
 	 * {@inheritDoc}
 	 * @see \Ajax\common\html\HtmlCollection::insertItem()
 	 */
-	public function insertItem($item,$position=0){
-		$item=parent::insertItem($this->getItemToInsert($item),$position);
+	public function insertItem($item, $position=0) {
+		$item=parent::insertItem($this->getItemToInsert($item), $position);
 		return $this->afterInsert($item);
 	}
 
-	public function generateMenuAsItem($menu,$header=null){
+	public function generateMenuAsItem($menu, $header=null) {
 		$count=$this->count();
-		$item=new HtmlSemDoubleElement("item-".$this->identifier."-".$count,"div");
-		if(isset($header)){
-			$headerItem=new HtmlSemDoubleElement("item-header-".$this->identifier."-".$count,"div","header");
+		$item=new HtmlSemDoubleElement("item-".$this->identifier."-".$count, "div");
+		if (isset($header)) {
+			$headerItem=new HtmlSemDoubleElement("item-header-".$this->identifier."-".$count, "div", "header");
 			$headerItem->setContent($header);
 			$item->addContent($headerItem);
 		}
@@ -91,24 +91,24 @@ 
 		$item->addContent($menu);
 		return $item;
 	}
-	public function addMenuAsItem($menu,$header=null){
-		return $this->addItem($this->generateMenuAsItem($menu,$header));
+	public function addMenuAsItem($menu, $header=null) {
+		return $this->addItem($this->generateMenuAsItem($menu, $header));
 	}
 
-	public function addPopupAsItem($value,$identifier, $content=""){
-		$value=new HtmlSemDoubleElement($identifier,"a","browse item",$value);
+	public function addPopupAsItem($value, $identifier, $content="") {
+		$value=new HtmlSemDoubleElement($identifier, "a", "browse item", $value);
 		$value->addContent(new HtmlIcon("", "dropdown"));
 		$value=$this->addItem($value);
-		$popup=new HtmlPopup($value,"popup-".$this->identifier."-".$this->count(),$content);
+		$popup=new HtmlPopup($value, "popup-".$this->identifier."-".$this->count(), $content);
 		$popup->setFlowing()->setPosition("bottom left")->setOn("click");
-		$this->wrap("",$popup);
+		$this->wrap("", $popup);
 		return $popup;
 	}
 
-	public function addDropdownAsItem($value,$items=NULL){
+	public function addDropdownAsItem($value, $items=NULL) {
 		$dd=$value;
-		if(\is_string($value)){
-			$dd=new HtmlDropdown("dropdown-".$this->identifier."-".$this->count(),$value,$items);
+		if (\is_string($value)) {
+			$dd=new HtmlDropdown("dropdown-".$this->identifier."-".$this->count(), $value, $items);
 		}
 		return $this->addItem($dd);
 	}
@@ -117,51 +117,51 @@ 
 	 * @see \Ajax\common\html\html5\HtmlCollection::createItem()
 	 */
 	protected function createItem($value) {
-		$itemO=new HtmlLink("item-".\sizeof($this->content),"",$value);
+		$itemO=new HtmlLink("item-".\sizeof($this->content), "", $value);
 		return $itemO->setClass("item");
 	}
 
-	public function setInverted(){
+	public function setInverted() {
 		return $this->addToProperty("class", "inverted");
 	}
 
-	public function setSecondary(){
+	public function setSecondary() {
 		return $this->addToProperty("class", "secondary");
 	}
 
-	public function setVertical(){
-		return $this->addToPropertyCtrl("class", "vertical",array("vertical"));
+	public function setVertical() {
+		return $this->addToPropertyCtrl("class", "vertical", array("vertical"));
 	}
 
-	public function setPosition($value="right"){
-		return $this->addToPropertyCtrl("class", $value,array("right","left"));
+	public function setPosition($value="right") {
+		return $this->addToPropertyCtrl("class", $value, array("right", "left"));
 	}
 
-	public function setPointing($value=Direction::NONE){
-		return $this->addToPropertyCtrl("class", $value." pointing",Direction::getConstantValues("pointing"));
+	public function setPointing($value=Direction::NONE) {
+		return $this->addToPropertyCtrl("class", $value." pointing", Direction::getConstantValues("pointing"));
 	}
 
-	public function asTab($vertical=false){
-		$this->apply(function(HtmlDoubleElement &$item){$item->setTagName("a");});
-		if($vertical===true)
+	public function asTab($vertical=false) {
+		$this->apply(function(HtmlDoubleElement & $item) {$item->setTagName("a"); });
+		if ($vertical===true)
 			$this->setVertical();
 		return $this->addToProperty("class", "tabular");
 	}
 
-	public function asPagination(){
-		$this->apply(function(HtmlDoubleElement &$item){$item->setTagName("a");});
+	public function asPagination() {
+		$this->apply(function(HtmlDoubleElement & $item) {$item->setTagName("a"); });
 			return $this->addToProperty("class", "pagination");
 	}
 
-	public function setFixed(){
+	public function setFixed() {
 		return $this->addToProperty("class", "fixed");
 	}
 
-	public function setFluid(){
+	public function setFluid() {
 		return $this->addToProperty("class", "fluid");
 	}
 
-	public function setCompact(){
+	public function setCompact() {
 		return $this->addToProperty("class", "compact");
 	}
 
@@ -170,7 +170,7 @@ 
 	 */
 	public function fromDatabaseObject($object, $function) {
 		$return=$function($object);
-		if(\is_array($return))
+		if (\is_array($return))
 			$this->addItems($return);
 		else
 		$this->addItem($return);
@@ -181,19 +181,19 @@ 
 	 * @param int $width
 	 * @return \Ajax\semantic\html\collections\menus\HtmlMenu
 	 */
-	public function setWidth($width){
-		if(\is_int($width)){
+	public function setWidth($width) {
+		if (\is_int($width)) {
 			$width=Wide::getConstants()["W".$width];
 		}
 		$this->addToPropertyCtrl("class", $width, Wide::getConstants());
-		return $this->addToPropertyCtrl("class", "item",array("item"));
+		return $this->addToPropertyCtrl("class", "item", array("item"));
 	}
 
-	public function addImage($identifier, $src="", $alt=""){
-		return $this->addItem(new HtmlImg($identifier,$src,$alt));
+	public function addImage($identifier, $src="", $alt="") {
+		return $this->addItem(new HtmlImg($identifier, $src, $alt));
 	}
 
-	public static function vertical($identifier,$items=array()){
-		return (new HtmlMenu($identifier,$items))->setVertical();
+	public static function vertical($identifier, $items=array()) {
+		return (new HtmlMenu($identifier, $items))->setVertical();
 	}
 }
\ No newline at end of file

Ajax/semantic/components/Popup.php

Spacing +4 added lines, -4 removed lines

@@ -30,7 +30,7 @@ 
 		return $this->setParam("onShow", "%function(){".$jsCode."}%");
 	}
 
-	public function setExclusive($value){
+	public function setExclusive($value) {
 		return $this->setParam("exclusive", $value);
 	}
 
@@ -39,15 +39,15 @@ 
 	 * @param string $popup the css selector of the popup
 	 * @return \Ajax\semantic\components\Popup
 	 */
-	public function setPopup($popup){
+	public function setPopup($popup) {
 		return $this->setParam("popup", $popup);
 	}
 
-	public function setInline($value){
+	public function setInline($value) {
 		return $this->setParam("inline", $value);
 	}
 
-	public function setPosition($value){
+	public function setPosition($value) {
 		return $this->setParam("position", $value);
 	}
 	//TODO other events implementation