jcheron / phalcon-jquery

Ajax/semantic/html/collections/HtmlGrid.php

Doc Comments +7 added lines, -2 removed lines

@@ -21,6 +21,11 @@ 
 	private $_createCols;
 	private $_colSizing=true;
 	private $_implicitRows=false;
+
+	/**
+	 * @param string $identifier
+	 * @param integer $numCols
+	 */
 	public function __construct( $identifier,$numRows=1,$numCols=NULL,$createCols=true,$implicitRows=false){
 		parent::__construct( $identifier, "div","ui grid");
 		$this->_implicitRows=$implicitRows;
@@ -95,7 +100,7 @@ 
 	/**
 	 * return the row at $index
 	 * @param int $index
-	 * @return \Ajax\semantic\html\collections\HtmlGridRow
+	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
 	public function getRow($index){
 		return $this->getItem($index);
@@ -211,7 +216,7 @@ 
 
 	/**
 	 * stretch the row contents to take up the entire column height
-	 * @return \Ajax\semantic\html\content\HtmlGridRow
+	 * @return HtmlGrid
 	 */
 	public function setStretched(){
 		return $this->addToProperty("class", "stretched");

Spacing +66 added lines, -66 removed lines

@@ -16,46 +16,46 @@ 
  * @author jc
  * @version 1.001
  */
-class HtmlGrid extends HtmlSemCollection{
+class HtmlGrid extends HtmlSemCollection {
 	use TextAlignmentTrait;
 	private $_createCols;
 	private $_colSizing=true;
 	private $_implicitRows=false;
-	public function __construct( $identifier,$numRows=1,$numCols=NULL,$createCols=true,$implicitRows=false){
-		parent::__construct( $identifier, "div","ui grid");
+	public function __construct($identifier, $numRows=1, $numCols=NULL, $createCols=true, $implicitRows=false) {
+		parent::__construct($identifier, "div", "ui grid");
 		$this->_implicitRows=$implicitRows;
 		$this->_createCols=$createCols;
-		if(isset($numCols)){
+		if (isset($numCols)) {
 			//if($this->_createCols){
 				$this->_colSizing=false;
 			//}
 			$this->setWide($numCols);
 		}
-		$this->setRowsCount($numRows,$numCols);
+		$this->setRowsCount($numRows, $numCols);
 	}
 
-	public function setWide($wide){
+	public function setWide($wide) {
 		$wide=Wide::getConstants()["W".$wide];
 		$this->addToPropertyCtrl("class", $wide, Wide::getConstants());
-		return $this->addToPropertyCtrl("class","column",array("column"));
+		return $this->addToPropertyCtrl("class", "column", array("column"));
 	}
 
-	public function addRow($colsCount=NULL){
+	public function addRow($colsCount=NULL) {
 		$rowCount=$this->rowCount()+1;
-		$this->setRowsCount($rowCount,$colsCount,true);
+		$this->setRowsCount($rowCount, $colsCount, true);
 		return $this->content[$rowCount-1];
 	}
 
-	public function addCol($width=NULL){
+	public function addCol($width=NULL) {
 		$colCount=$this->colCount()+1;
-		$this->setColsCount($colCount,true,$width);
-		if($this->hasOnlyCols($this->count()))
+		$this->setColsCount($colCount, true, $width);
+		if ($this->hasOnlyCols($this->count()))
 			return $this->content[$colCount-1];
 		return $this;
 	}
 
-	public function addCols($sizes=array()){
-		foreach ($sizes as $size){
+	public function addCols($sizes=array()) {
+		foreach ($sizes as $size) {
 			$this->addCol($size);
 		}
 		return $this;
@@ -67,42 +67,42 @@ 
 	 * @param int $colsCount
 	 * @return \Ajax\semantic\html\collections\HtmlGrid
 	 */
-	public function setRowsCount($rowsCount,$colsCount=NULL,$force=false){
+	public function setRowsCount($rowsCount, $colsCount=NULL, $force=false) {
 		$count=$this->count();
-		if($rowsCount<2 && $force===false){
-			for($i=$count;$i<$colsCount;$i++){
+		if ($rowsCount<2 && $force===false) {
+			for ($i=$count; $i<$colsCount; $i++) {
 				$this->addItem(new HtmlGridCol("col-".$this->identifier."-".$i));
 			}
-		}else{
-			if($this->hasOnlyCols($count)){
+		}else {
+			if ($this->hasOnlyCols($count)) {
 				$tmpContent=$this->content;
 				$item=$this->addItem($colsCount);
 				$item->setContent($tmpContent);
 				$this->content=array();
 				$count=1;
 			}
-			for($i=$count;$i<$rowsCount;$i++){
+			for ($i=$count; $i<$rowsCount; $i++) {
 				$this->addItem($colsCount);
 			}
 		}
 		return $this;
 	}
 
-	protected function hasOnlyCols($count){
+	protected function hasOnlyCols($count) {
 		return $count>0 && $this->content[0] instanceof HtmlGridCol;
 	}
 
-	public function setColsCount($numCols,$toCreate=true,$width=NULL){
-		if(isset($width)===false)
+	public function setColsCount($numCols, $toCreate=true, $width=NULL) {
+		if (isset($width)===false)
 			$this->setWide($numCols);
-		if($toCreate==true){
+		if ($toCreate==true) {
 			$count=$this->count();
-			if($count==0 || $this->hasOnlyCols($count)){
-				for($i=$count;$i<$numCols;$i++){
-					$this->addItem(new HtmlGridCol("col-".$this->identifier."-".$i,$width));
+			if ($count==0 || $this->hasOnlyCols($count)) {
+				for ($i=$count; $i<$numCols; $i++) {
+					$this->addItem(new HtmlGridCol("col-".$this->identifier."-".$i, $width));
 				}
-			}else{
-				for($i=0;$i<$count;$i++){
+			}else {
+				for ($i=0; $i<$count; $i++) {
 					$this->getItem($i)->setColsCount($numCols);
 				}
 			}
@@ -115,22 +115,22 @@ 
 	 * @param int $index
 	 * @return \Ajax\semantic\html\collections\HtmlGridRow
 	 */
-	public function getRow($index){
+	public function getRow($index) {
 		return $this->getItem($index);
 	}
 
-	public function rowCount(){
+	public function rowCount() {
 		$count=$this->count();
-		if($this->hasOnlyCols($count))
+		if ($this->hasOnlyCols($count))
 			return 0;
 		return $count;
 	}
 
-	public function colCount(){
+	public function colCount() {
 		$count=$this->count();
-		if($this->hasOnlyCols($count))
+		if ($this->hasOnlyCols($count))
 			return $count;
-		if($count>0)
+		if ($count>0)
 			return $this->getItem(0)->count();
 		return 0;
 	}
@@ -140,11 +140,11 @@ 
 	 * @param int $col
 	 * @return \Ajax\semantic\html\collections\HtmlGridCol
 	 */
-	public function getCell($row,$col){
-		if($row<2 && $this->hasOnlyCols($this->count()))
+	public function getCell($row, $col) {
+		if ($row<2 && $this->hasOnlyCols($this->count()))
 			return $this->getItem($col);
 		$row=$this->getItem($row);
-		if(isset($row)){
+		if (isset($row)) {
 			$col=$row->getItem($col);
 		}
 		return $col;
@@ -155,9 +155,9 @@ 
 	 * @param boolean $vertically
 	 * @return \Ajax\semantic\html\collections\HtmlGrid
 	 */
-	public function setDivided($vertically=false){
-		$value=($vertically===true)?"vertically divided":"divided";
-		return $this->addToPropertyCtrl("class", $value,array("divided"));
+	public function setDivided($vertically=false) {
+		$value=($vertically===true) ? "vertically divided" : "divided";
+		return $this->addToPropertyCtrl("class", $value, array("divided"));
 	}
 
 	/**
@@ -165,23 +165,23 @@ 
 	 * @param boolean $internally true for internal cells
 	 * @return \Ajax\semantic\html\collections\HtmlGrid
 	 */
-	public function setCelled($internally=false){
-		$value=($internally===true)?"internally celled":"celled";
-		return $this->addToPropertyCtrl("class", $value,array("celled","internally celled"));
+	public function setCelled($internally=false) {
+		$value=($internally===true) ? "internally celled" : "celled";
+		return $this->addToPropertyCtrl("class", $value, array("celled", "internally celled"));
 	}
 
 	/**
 	 * A grid can have its columns centered
 	 */
-	public function setCentered(){
-		return $this->addToPropertyCtrl("class", "centered",array("centered"));
+	public function setCentered() {
+		return $this->addToPropertyCtrl("class", "centered", array("centered"));
 	}
 
 	/**
 	 * automatically resize all elements to split the available width evenly
 	 * @return \Ajax\semantic\html\collections\HtmlGrid
 	 */
-	public function setEqualWidth(){
+	public function setEqualWidth() {
 		return $this->addToProperty("class", "equal width");
 	}
 
@@ -190,9 +190,9 @@ 
 	 * @param string $value
 	 * @return \Ajax\semantic\html\collections\HtmlGrid
 	 */
-	public function setPadded($value=NULL){
-		if(isset($value))
-			$this->addToPropertyCtrl("class", $value,array("vertically","horizontally"));
+	public function setPadded($value=NULL) {
+		if (isset($value))
+			$this->addToPropertyCtrl("class", $value, array("vertically", "horizontally"));
 		return $this->addToProperty("class", "padded");
 	}
 
@@ -200,37 +200,37 @@ 
 	 * @param boolean $very
 	 * @return \Ajax\semantic\html\collections\HtmlGrid
 	 */
-	public function setRelaxed($very=false){
-		$value=($very===true)?"very relaxed":"relaxed";
-		return $this->addToPropertyCtrl("class", $value,array("relaxed","very relaxed"));
+	public function setRelaxed($very=false) {
+		$value=($very===true) ? "very relaxed" : "relaxed";
+		return $this->addToPropertyCtrl("class", $value, array("relaxed", "very relaxed"));
 	}
 
-	public function setVerticalAlignment($value=VerticalAlignment::MIDDLE){
-		return $this->addToPropertyCtrl("class", $value." aligned",VerticalAlignment::getConstantValues("aligned"));
+	public function setVerticalAlignment($value=VerticalAlignment::MIDDLE) {
+		return $this->addToPropertyCtrl("class", $value." aligned", VerticalAlignment::getConstantValues("aligned"));
 	}
 
 	/**
 	 * {@inheritDoc}
 	 * @see \Ajax\common\html\HtmlCollection::createItem()
 	 */
-	protected function createItem($value){
-		if($this->_createCols===false)
+	protected function createItem($value) {
+		if ($this->_createCols===false)
 			$value=null;
-		$item=new HtmlGridRow($this->identifier."-row-".($this->count()+1),$value,$this->_colSizing,$this->_implicitRows);
+		$item=new HtmlGridRow($this->identifier."-row-".($this->count()+1), $value, $this->_colSizing, $this->_implicitRows);
 		return $item;
 	}
 
-	public function setValues($values){
+	public function setValues($values) {
 		$count=$this->count();
-		if($this->_createCols===false){
-			for($i=$count;$i<\sizeof($values);$i++){
+		if ($this->_createCols===false) {
+			for ($i=$count; $i<\sizeof($values); $i++) {
 				$colSize=\sizeof($values[$i]);
-				$this->addItem(new HtmlGridRow($this->identifier."-row-".($this->count()+1),$colSize,$this->_colSizing,$this->_implicitRows));
+				$this->addItem(new HtmlGridRow($this->identifier."-row-".($this->count()+1), $colSize, $this->_colSizing, $this->_implicitRows));
 			}
 		}
-		$count=\min(array($this->count(),\sizeof($values)));
-		for($i=0;$i<$count;$i++){
-			$this->content[$i]->setValues($values[$i],$this->_createCols===false);
+		$count=\min(array($this->count(), \sizeof($values)));
+		for ($i=0; $i<$count; $i++) {
+			$this->content[$i]->setValues($values[$i], $this->_createCols===false);
 		}
 	}
 
@@ -238,7 +238,7 @@ 
 	 * stretch the row contents to take up the entire column height
 	 * @return \Ajax\semantic\html\content\HtmlGridRow
 	 */
-	public function setStretched(){
+	public function setStretched() {
 		return $this->addToProperty("class", "stretched");
 	}
 

Braces +26 added lines, -18 removed lines

@@ -49,8 +49,9 @@ 
 	public function addCol($width=NULL){
 		$colCount=$this->colCount()+1;
 		$this->setColsCount($colCount,true,$width);
-		if($this->hasOnlyCols($this->count()))
-			return $this->content[$colCount-1];
+		if($this->hasOnlyCols($this->count())) {
+					return $this->content[$colCount-1];
+		}
 		return $this;
 	}
 
@@ -73,7 +74,7 @@ 
 			for($i=$count;$i<$colsCount;$i++){
 				$this->addItem(new HtmlGridCol("col-".$this->identifier."-".$i));
 			}
-		}else{
+		} else{
 			if($this->hasOnlyCols($count)){
 				$tmpContent=$this->content;
 				$item=$this->addItem($colsCount);
@@ -93,15 +94,16 @@ 
 	}
 
 	public function setColsCount($numCols,$toCreate=true,$width=NULL){
-		if(isset($width)===false)
-			$this->setWide($numCols);
+		if(isset($width)===false) {
+					$this->setWide($numCols);
+		}
 		if($toCreate==true){
 			$count=$this->count();
 			if($count==0 || $this->hasOnlyCols($count)){
 				for($i=$count;$i<$numCols;$i++){
 					$this->addItem(new HtmlGridCol("col-".$this->identifier."-".$i,$width));
 				}
-			}else{
+			} else{
 				for($i=0;$i<$count;$i++){
 					$this->getItem($i)->setColsCount($numCols);
 				}
@@ -121,17 +123,20 @@ 
 
 	public function rowCount(){
 		$count=$this->count();
-		if($this->hasOnlyCols($count))
-			return 0;
+		if($this->hasOnlyCols($count)) {
+					return 0;
+		}
 		return $count;
 	}
 
 	public function colCount(){
 		$count=$this->count();
-		if($this->hasOnlyCols($count))
-			return $count;
-		if($count>0)
-			return $this->getItem(0)->count();
+		if($this->hasOnlyCols($count)) {
+					return $count;
+		}
+		if($count>0) {
+					return $this->getItem(0)->count();
+		}
 		return 0;
 	}
 
@@ -141,8 +146,9 @@ 
 	 * @return \Ajax\semantic\html\collections\HtmlGridCol
 	 */
 	public function getCell($row,$col){
-		if($row<2 && $this->hasOnlyCols($this->count()))
-			return $this->getItem($col);
+		if($row<2 && $this->hasOnlyCols($this->count())) {
+					return $this->getItem($col);
+		}
 		$row=$this->getItem($row);
 		if(isset($row)){
 			$col=$row->getItem($col);
@@ -191,8 +197,9 @@ 
 	 * @return \Ajax\semantic\html\collections\HtmlGrid
 	 */
 	public function setPadded($value=NULL){
-		if(isset($value))
-			$this->addToPropertyCtrl("class", $value,array("vertically","horizontally"));
+		if(isset($value)) {
+					$this->addToPropertyCtrl("class", $value,array("vertically","horizontally"));
+		}
 		return $this->addToProperty("class", "padded");
 	}
 
@@ -214,8 +221,9 @@ 
 	 * @see \Ajax\common\html\HtmlCollection::createItem()
 	 */
 	protected function createItem($value){
-		if($this->_createCols===false)
-			$value=null;
+		if($this->_createCols===false) {
+					$value=null;
+		}
 		$item=new HtmlGridRow($this->identifier."-row-".($this->count()+1),$value,$this->_colSizing,$this->_implicitRows);
 		return $item;
 	}

Ajax/semantic/traits/SemanticComponentsTrait.php

Doc Comments +3 added lines

@@ -47,6 +47,9 @@
 		return $this->addComponent(new Accordion($this->js), $attachTo, $params);
 	}
 
+	/**
+	 * @param string $attachTo
+	 */
 	public function sticky($attachTo=NULL, $params=NULL) {
 		return $this->addComponent(new Sticky($this->js), $attachTo, $params);
 	}

Ajax/semantic/html/modules/HtmlPopup.php

Spacing +15 added lines, -15 removed lines

@@ -12,7 +12,7 @@ 
 class HtmlPopup extends HtmlSemDoubleElement {
 	private $_params;
 	private $_container;
-	public function __construct(BaseHtml $container,$identifier, $content="") {
+	public function __construct(BaseHtml $container, $identifier, $content="") {
 		parent::__construct($identifier, "div");
 		$this->_container=$container;
 		$this->setClass("ui popup");
@@ -20,21 +20,21 @@ 
 		$this->_params=array("on"=>"hover");
 	}
 
-	public function addList($items=array(),$header=NULL){
-		if(!$this->content instanceof HtmlGrid){
-			$this->content=new HtmlGrid("grid-".$this->identifier,0);
+	public function addList($items=array(), $header=NULL) {
+		if (!$this->content instanceof HtmlGrid) {
+			$this->content=new HtmlGrid("grid-".$this->identifier, 0);
 		}
 		$grid=$this->content;
 
 		$colCount=$grid->colCount();
 		$grid->setColsCount(++$colCount);
 
-		$list=new HtmlList("",$items);
+		$list=new HtmlList("", $items);
 		$list->asLink();
-		if(isset($header)){
-			$list->addHeader(4,$header);
+		if (isset($header)) {
+			$list->addHeader(4, $header);
 		}
-		$grid->getCell(0,$colCount-1)->setContent($list);
+		$grid->getCell(0, $colCount-1)->setContent($list);
 		$grid->setDivided()->setRelaxed(true);
 		return $list;
 	}
@@ -42,14 +42,14 @@ 
 	/**
 	 * A popup can have no maximum width and continue to flow to fit its content
 	 */
-	public function setFlowing(){
+	public function setFlowing() {
 		return $this->addToProperty("class", "flowing");
 	}
 
 	/**
 	 * A popup can provide more basic formatting
 	 */
-	public function setBasic(){
+	public function setBasic() {
 		return $this->addToProperty("class", "basic");
 	}
 
@@ -57,22 +57,22 @@ 
 	 * {@inheritDoc}
 	 * @see \Ajax\semantic\html\base\HtmlSemDoubleElement::run()
 	 */
-	public function run(JsUtils $js){
+	public function run(JsUtils $js) {
 		$this->_params["popup"]="#".$this->identifier;
-		$js->semantic()->popup("#".$this->_container->getIdentifier(),$this->_params);
+		$js->semantic()->popup("#".$this->_container->getIdentifier(), $this->_params);
 	}
 
-	public function setOn($event="click"){
+	public function setOn($event="click") {
 		$this->_params["on"]=$event;
 		return $this;
 	}
 
-	public function setInline($value=true){
+	public function setInline($value=true) {
 		$this->_params["inline"]=$value;
 		return $this;
 	}
 
-	public function setPosition($position){
+	public function setPosition($position) {
 		$this->_params["position"]=$position;
 		return $this;
 	}

Ajax/semantic/html/modules/HtmlSticky.php

Spacing +5 added lines, -5 removed lines

@@ -8,13 +8,13 @@ 
 class HtmlSticky extends HtmlSemDoubleElement {
 	private $_params=array();
 
-	public function __construct($identifier,$context=NULL,$content=NULL) {
+	public function __construct($identifier, $context=NULL, $content=NULL) {
 		parent::__construct($identifier, "div", "ui sticky", $content);
-		if(isset($content))
+		if (isset($content))
 			$this->setContext($context);
 	}
 
-	public function setContext($context){
+	public function setContext($context) {
 		$this->_params["context"]=$context;
 		return $this;
 	}
@@ -23,8 +23,8 @@ 
 	 * {@inheritDoc}
 	 * @see \Ajax\semantic\html\base\HtmlSemDoubleElement::run()
 	 */
-	public function run(JsUtils $js){
+	public function run(JsUtils $js) {
 		parent::run($js);
-		return $js->semantic()->sticky("#".$this->identifier,$this->_params);
+		return $js->semantic()->sticky("#".$this->identifier, $this->_params);
 	}
 }
\ No newline at end of file

Braces +3 added lines, -2 removed lines

@@ -10,8 +10,9 @@
 
 	public function __construct($identifier,$context=NULL,$content=NULL) {
 		parent::__construct($identifier, "div", "ui sticky", $content);
-		if(isset($content))
-			$this->setContext($context);
+		if(isset($content)) {
+					$this->setContext($context);
+		}
 	}
 
 	public function setContext($context){