jcheron / phalcon-jquery

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

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/html/content/table/HtmlTableContent.php

Doc Comments +3 added lines

@@ -20,6 +20,9 @@
 	protected $_tabsType="tabs";
 	protected $stacked="";
 
+	/**
+	 * @param string $identifier
+	 */
 	public function __construct($identifier, $tagName="ul") {
 		parent::__construct($identifier, $tagName);
 		$this->_template="<%tagName% %properties%>%tabs%</%tagName%>%content%";

Spacing +26 added lines, -26 removed lines

@@ -4,22 +4,22 @@ 
 
 use Ajax\semantic\html\base\HtmlSemCollection;
 
-class HtmlTableContent extends HtmlSemCollection{
+class HtmlTableContent extends HtmlSemCollection {
 
-	protected $_tdTagNames=["thead"=>"th","tbody"=>"td","tfoot"=>"th"];
+	protected $_tdTagNames=["thead"=>"th", "tbody"=>"td", "tfoot"=>"th"];
 
-	public function __construct( $identifier,$tagName="tbody",$rowCount=NULL,$colCount=NULL){
-		parent::__construct( $identifier, $tagName, "");
-		if(isset($rowCount) && isset($colCount))
+	public function __construct($identifier, $tagName="tbody", $rowCount=NULL, $colCount=NULL) {
+		parent::__construct($identifier, $tagName, "");
+		if (isset($rowCount) && isset($colCount))
 			$this->setRowCount($rowCount, $colCount);
 	}
 
-	public function setRowCount($rowCount,$colCount){
+	public function setRowCount($rowCount, $colCount) {
 		$count=$this->count();
-		for($i=$count;$i<$rowCount;$i++){
+		for ($i=$count; $i<$rowCount; $i++) {
 			$this->addItem($colCount);
 		}
-		for($i=0;$i<$rowCount;$i++){
+		for ($i=0; $i<$rowCount; $i++) {
 			$item=$this->content[$i];
 			$item->setTdTagName($this->_tdTagNames[$this->tagName]);
 			$this->content[$i]->setColCount($colCount);
@@ -27,9 +27,9 @@ 
 		return $this;
 	}
 
-	protected function createItem($value){
+	protected function createItem($value) {
 		$count=$this->count();
-		$tr= new HtmlTR("", $value);
+		$tr=new HtmlTR("", $value);
 		$tr->setContainer($this, $count);
 		return $tr;
 	}
@@ -40,57 +40,57 @@ 
 	 * @param int $col
 	 * @return \Ajax\semantic\html\content\HtmlTD
 	 */
-	public function getCell($row,$col){
+	public function getCell($row, $col) {
 		$row=$this->getItem($row);
-		if(isset($row)){
+		if (isset($row)) {
 			$col=$row->getItem($col);
 		}
 		return $col;
 	}
 
-	public function getRow($index){
+	public function getRow($index) {
 		return $this->getItem($index);
 	}
 
-	public function setCellValue($row,$col,$value=""){
+	public function setCellValue($row, $col, $value="") {
 		$cell=$this->getCell($row, $col);
-		if(isset($cell)){
+		if (isset($cell)) {
 			$cell->setValue($value);
 		}
 		return $this;
 	}
 
-	public function setValues($values=array()){
+	public function setValues($values=array()) {
 		$count=$this->count();
-		if(\is_array($values)===false){
+		if (\is_array($values)===false) {
 			$values=\array_fill(0, $count, $values);
 		}
-		$count=\min(\sizeof($values),$count);
+		$count=\min(\sizeof($values), $count);
 
-		for ($i=0;$i<$count;$i++){
+		for ($i=0; $i<$count; $i++) {
 			$row=$this->content[$i];
 			$row->setValues($values[$i]);
 		}
 	}
 
-	public function getRowCount(){
+	public function getRowCount() {
 		return $this->count();
 	}
 
-	public function getColCount(){
+	public function getColCount() {
 		$result=0;
-		if($this->count()>0)
+		if ($this->count()>0)
 			$result=$this->getItem(0)->getColCount();
 		return $result;
 	}
 
-	public function delete($rowIndex,$colIndex=NULL){
-		if(isset($colIndex)){
+	public function delete($rowIndex, $colIndex=NULL) {
+		if (isset($colIndex)) {
 			$row=$this->getItem($rowIndex);
-			if(isset($row)===true){
+			if (isset($row)===true) {
 				$row->delete($colIndex);
 			}
-		}else{
+		}else {
 			$this->removeItem($rowIndex);
 		}
 		return $this;

Ajax/semantic/html/content/table/HtmlTR.php

Doc Comments +6 added lines

@@ -10,6 +10,9 @@ 
 	private $_container;
 	private $_row;
 
+	/**
+	 * @param string $identifier
+	 */
 	public function __construct( $identifier, $colCount){
 		parent::__construct( $identifier, "tr", "");
 	}
@@ -35,6 +38,9 @@ 
 		$this->_tdTagName=$tagName;
 	}
 
+	/**
+	 * @param HtmlTableContent $container
+	 */
 	public function setContainer($container,$row){
 		$this->_container=$container;
 		$this->_row=$row;

Spacing +14 added lines, -14 removed lines

@@ -4,19 +4,19 @@ 
 
 use Ajax\semantic\html\base\HtmlSemCollection;
 
-class HtmlTR extends HtmlSemCollection{
+class HtmlTR extends HtmlSemCollection {
 
 	private $_tdTagName;
 	private $_container;
 	private $_row;
 
-	public function __construct( $identifier, $colCount){
-		parent::__construct( $identifier, "tr", "");
+	public function __construct($identifier, $colCount) {
+		parent::__construct($identifier, "tr", "");
 	}
 
-	public function setColCount($colCount){
+	public function setColCount($colCount) {
 		$count=$this->count();
-		for($i=$count;$i<$colCount;$i++){
+		for ($i=$count; $i<$colCount; $i++) {
 			$item=$this->addItem(NULL);
 			$item->setTagName($this->_tdTagName);
 		}
@@ -24,36 +24,36 @@ 
 	}
 
 
-	protected function createItem($value){
+	protected function createItem($value) {
 		$count=$this->count();
-		$td=new HtmlTD("",$this->_container,$value,$this->_tdTagName);
+		$td=new HtmlTD("", $this->_container, $value, $this->_tdTagName);
 		$td->setContainer($this->_container, $this->_row, $count);
 		return $td;
 	}
 
-	public function setTdTagName($tagName="td"){
+	public function setTdTagName($tagName="td") {
 		$this->_tdTagName=$tagName;
 	}
 
-	public function setContainer($container,$row){
+	public function setContainer($container, $row) {
 		$this->_container=$container;
 		$this->_row=$row;
 	}
 
-	public function setValues($values=array()){
+	public function setValues($values=array()) {
 		$count=$this->count();
-		if(\is_array($values)===false){
+		if (\is_array($values)===false) {
 			$values=\array_fill(0, $count, $values);
 		}
-		$count=\min(\sizeof($values),$count);
+		$count=\min(\sizeof($values), $count);
 
-		for ($i=0;$i<$count;$i++){
+		for ($i=0; $i<$count; $i++) {
 			$cell=$this->content[$i];
 			$cell->setValue($values[$i]);
 		}
 	}
 
-	public function delete($index){
+	public function delete($index) {
 		$this->removeItem($index);
 		return $this;
 	}

Ajax/semantic/html/elements/HtmlLabel.php

Doc Comments +4 added lines, -1 removed lines

@@ -10,6 +10,10 @@ 
 
 class HtmlLabel extends HtmlSemDoubleElement {
 	use LabeledIconTrait;
+
+	/**
+	 * @param string $icon
+	 */
 	public function __construct($identifier,$caption="",$icon=NULL,$tagName="div") {
 		parent::__construct($identifier,$tagName,"ui label");
 		$this->content=$caption;
@@ -18,7 +22,6 @@ 
 	}
 
 	/**
-	 * @param string $side
 	 * @return \Ajax\semantic\html\elements\HtmlLabel
 	 */
 	public function setPointing($value=Direction::NONE){

Spacing +17 added lines, -17 removed lines

@@ -10,10 +10,10 @@ 
 
 class HtmlLabel extends HtmlSemDoubleElement {
 	use LabeledIconTrait;
-	public function __construct($identifier,$caption="",$icon=NULL,$tagName="div") {
-		parent::__construct($identifier,$tagName,"ui label");
+	public function __construct($identifier, $caption="", $icon=NULL, $tagName="div") {
+		parent::__construct($identifier, $tagName, "ui label");
 		$this->content=$caption;
-		if(isset($icon))
+		if (isset($icon))
 			$this->addIcon($icon);
 	}
 
@@ -21,33 +21,33 @@ 
 	 * @param string $side
 	 * @return \Ajax\semantic\html\elements\HtmlLabel
 	 */
-	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"));
 	}
 
 	/**
 	 * @param string $side
 	 * @return \Ajax\semantic\html\elements\HtmlLabel
 	 */
-	public function toCorner($side="left"){
-		return $this->addToPropertyCtrl("class", $side." corner",array("right corner","left corner"));
+	public function toCorner($side="left") {
+		return $this->addToPropertyCtrl("class", $side." corner", array("right corner", "left corner"));
 	}
 
 	/**
 	 * @return \Ajax\semantic\html\elements\HtmlLabel
 	 */
-	public function asTag(){
+	public function asTag() {
 		return $this->addToProperty("class", "tag");
 	}
 
 	/**
 	 * @return \Ajax\semantic\html\elements\HtmlLabel
 	 */
-	public function asLink(){
+	public function asLink() {
 		return $this->setTagName("a");
 	}
 
-	public function setBasic(){
+	public function setBasic() {
 		return $this->addToProperty("class", "basic");
 	}
 
@@ -58,28 +58,28 @@ 
 	 * @param string $before
 	 * @return \Ajax\semantic\html\elements\HtmlLabel
 	 */
-	public function addImage($src,$alt="",$before=true){
+	public function addImage($src, $alt="", $before=true) {
 		$this->addToProperty("class", "image");
-		return $this->addContent(new HtmlImg("image-".$this->identifier,$src,$alt),$before);
+		return $this->addContent(new HtmlImg("image-".$this->identifier, $src, $alt), $before);
 	}
 
 	/**
 	 * @param string $detail
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
-	public function addDetail($detail){
-		$div=new HtmlDoubleElement("detail-".$this->identifier,$this->tagName);
+	public function addDetail($detail) {
+		$div=new HtmlDoubleElement("detail-".$this->identifier, $this->tagName);
 		$div->setClass("detail");
 		$div->setContent($detail);
 		$this->addContent($div);
 		return $div;
 	}
 
-	public function asRibbon(){
+	public function asRibbon() {
 		return $this->addToPropertyCtrl("class", "ribbon", array("ribbon"));
 	}
 
-	public static function ribbon($identifier,$caption){
-		return (new HtmlLabel($identifier,$caption))->asRibbon();
+	public static function ribbon($identifier, $caption) {
+		return (new HtmlLabel($identifier, $caption))->asRibbon();
 	}
 }
\ No newline at end of file

Ajax/semantic/html/collections/HtmlTable.php

Spacing +12 added lines, -12 removed lines

@@ -17,35 +17,35 @@ 
 	 * @param string $key
 	 * @return HtmlTableContent
 	 */
-	private function getPart($key){
-		if(\array_key_exists($key, $this->content)===false){
-			$this->content[$key]=new HtmlTableContent("",$key);
-			if($key!=="tbody"){
+	private function getPart($key) {
+		if (\array_key_exists($key, $this->content)===false) {
+			$this->content[$key]=new HtmlTableContent("", $key);
+			if ($key!=="tbody") {
 				$this->content[$key]->setRowCount(1, $this->_colCount);
 			}
 		}
 		return $this->content[$key];
 	}
 
-	public function getBody(){
+	public function getBody() {
 		return $this->getPart("tbody");
 	}
 
-	public function getHeader(){
+	public function getHeader() {
 		return $this->getPart("thead");
 	}
 
-	public function getFooter(){
+	public function getFooter() {
 		return $this->getPart("tfoot");
 	}
 
-	public function hasPart($key){
+	public function hasPart($key) {
 		return \array_key_exists($key, $this->content)===true;
 	}
 
 	public function setRowCount($rowCount, $colCount) {
 		$this->_colCount=$colCount;
-		return $this->getBody()->setRowCount($rowCount,$colCount);
+		return $this->getBody()->setRowCount($rowCount, $colCount);
 	}
 
 	/**
@@ -54,11 +54,11 @@ 
 	 * @param int $col
 	 * @return \Ajax\semantic\html\content\HtmlTD
 	 */
-	public function getCell($row,$col){
-		return $this->getBody()->getCell($row,$col);
+	public function getCell($row, $col) {
+		return $this->getBody()->getCell($row, $col);
 	}
 
-	public function setValues($values=array()){
+	public function setValues($values=array()) {
 		$this->getBody()->setValues($values);
 	}
 }
\ No newline at end of file

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

Spacing +5 added lines, -5 removed lines

@@ -7,19 +7,19 @@
 use Phalcon\Mvc\View;
 use Ajax\semantic\html\elements\HtmlIcon;
 
-class HtmlPaginationMenu extends HtmlMenu{
+class HtmlPaginationMenu extends HtmlMenu {
 
-	public function __construct( $identifier, $items=array() ){
-		parent::__construct( $identifier,$items);
+	public function __construct($identifier, $items=array()) {
+		parent::__construct($identifier, $items);
 	}
 	/**
 	 * {@inheritDoc}
 	 * @see \Ajax\common\html\BaseHtml::compile()
 	 */
-	public function compile(JsUtils $js=NULL,View $view=NULL){
+	public function compile(JsUtils $js=NULL, View $view=NULL) {
 		$this->insertItem(new HtmlIcon("", "left chevron"));
 		$this->addItem(new HtmlIcon("", "right chevron"));
 		$this->asPagination();
-		return parent::compile($js,$view);
+		return parent::compile($js, $view);
 	}
 }
\ No newline at end of file

Ajax/semantic/html/content/table/HtmlTD.php

Spacing +13 added lines, -13 removed lines

@@ -8,42 +8,42 @@
 	private $_container;
 	private $_row;
 	private $_col;
-	public function __construct($identifier,$content=NULL,$tagName="td") {
+	public function __construct($identifier, $content=NULL, $tagName="td") {
 		parent::__construct($identifier, $tagName, "", $content);
 	}
 
-	public function setContainer($container,$row,$col){
+	public function setContainer($container, $row, $col) {
 		$this->_container=$container;
 		$this->_row=$row;
 		$this->_col=$col;
 	}
 
-	public function setValue($value){
+	public function setValue($value) {
 		$this->content=$value;
 		return $this;
 	}
 
-	public function setRowspan($rowspan){
-		$to=min($this->_container->count(),$this->_row+$rowspan-1);
-		for($i=$to;$i>$this->_row;$i--){
-			$this->_container->delete($this->_row+1,$this->_col);
+	public function setRowspan($rowspan) {
+		$to=min($this->_container->count(), $this->_row+$rowspan-1);
+		for ($i=$to; $i>$this->_row; $i--) {
+			$this->_container->delete($this->_row+1, $this->_col);
 		}
 		$this->setProperty("rowspan", $rowspan);
 		return $this->_container;
 	}
 
-	public function rowMerge(){
+	public function rowMerge() {
 		return $this->setRowspan($this->_container->count());
 	}
 
-	public function colMerge(){
+	public function colMerge() {
 		return $this->setColspan($this->_container->getRow($this->_row)->count());
 	}
 
-	public function setColspan($colspan){
-		$to=min($this->_container->getRow($this->_row)->count(),$this->_col+$colspan-1);
-		for($i=$to;$i>$this->_col;$i--){
-			$this->_container->delete($this->_row,$this->_col+1);
+	public function setColspan($colspan) {
+		$to=min($this->_container->getRow($this->_row)->count(), $this->_col+$colspan-1);
+		for ($i=$to; $i>$this->_col; $i--) {
+			$this->_container->delete($this->_row, $this->_col+1);
 		}
 		$this->setProperty("colspan", $colspan);
 		return $this->_container;

Ajax/semantic/traits/SemanticHtmlCollectionsTrait.php

Spacing +3 added lines, -3 removed lines

@@ -17,8 +17,8 @@ 
 	 * @param mixed $value
 	 * @param CheckboxType $type
 	 */
-	public function htmlCheckbox($identifier, $label=NULL,$value=NULL,$type=NULL){
-		return $this->addHtmlComponent(new HtmlFormCheckbox($identifier,$label,$value,$type));
+	public function htmlCheckbox($identifier, $label=NULL, $value=NULL, $type=NULL) {
+		return $this->addHtmlComponent(new HtmlFormCheckbox($identifier, $label, $value, $type));
 	}
 
 	/**
@@ -26,7 +26,7 @@ 
 	 * @param int $rowCount
 	 * @param int $colCount
 	 */
-	public function htmlTable($identifier, $rowCount, $colCount){
+	public function htmlTable($identifier, $rowCount, $colCount) {
 		return $this->addHtmlComponent(new HtmlTable($identifier, $rowCount, $colCount));
 	}
 }
\ No newline at end of file

Ajax/semantic/traits/SemanticHtmlElementsTrait.php

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