phpMv / phpMv-UI

Ajax/semantic/html/elements/HtmlList.php

Spacing +48 added lines, -48 removed lines

@@ -13,9 +13,9 @@ 
 
 	protected $_hasCheckedList;
 
-	protected $_fireOnInit = false;
+	protected $_fireOnInit=false;
 
-	protected $_ckItemChange = "";
+	protected $_ckItemChange="";
 
 	protected $_maxVisible;
 
@@ -23,25 +23,25 @@ 
 
 	protected $_visibility;
 
-	public function __construct($identifier, $items = array()) {
+	public function __construct($identifier, $items=array()) {
 		parent::__construct($identifier, "div", "ui list");
 		$this->addItems($items);
-		$this->_hasCheckedList = false;
+		$this->_hasCheckedList=false;
 	}
 
 	protected function createItem($value) {
-		$count = $this->count();
-		$item = new HtmlListItem("item-" . $this->identifier . "-" . $count, $value);
+		$count=$this->count();
+		$item=new HtmlListItem("item-".$this->identifier."-".$count, $value);
 		return $item;
 	}
 
 	public function addHeader($niveau, $content) {
-		$header = new HtmlHeader("header-" . $this->identifier, $niveau, $content, "page");
+		$header=new HtmlHeader("header-".$this->identifier, $niveau, $content, "page");
 		$this->wrap($header);
 		return $header;
 	}
 
-	public function getItemPart($index, $partName = "header") {
+	public function getItemPart($index, $partName="header") {
 		return $this->getItem($index)->getPart($partName);
 	}
 
@@ -49,15 +49,15 @@ 
 		return $this->contentAs($tagName);
 	}
 
-	public function asLinks($hrefs = [], $target = NUll) {
+	public function asLinks($hrefs=[], $target=NUll) {
 		$this->addToPropertyCtrl("class", "link", array(
 			"link"
 		));
 		return parent::asLinks($hrefs, $target);
 	}
 
-	public function addList($items = array()) {
-		$list = new HtmlList("", $items);
+	public function addList($items=array()) {
+		$list=new HtmlList("", $items);
 		$list->setClass("list");
 		return $this->addItem($list);
 	}
@@ -71,7 +71,7 @@ 
 	}
 
 	protected function getItemToAdd($item) {
-		$itemO = parent::getItemToAdd($item);
+		$itemO=parent::getItemToAdd($item);
 		if ($itemO instanceof AbstractCheckbox)
 			$itemO->addClass("item");
 		return $itemO;
@@ -90,11 +90,11 @@ 
 	}
 
 	public function run(JsUtils $js) {
-		if ($this->_hasCheckedList === true) {
-			$jsCode = include dirname(__FILE__) . '/../../components/jsTemplates/tplCheckedList.php';
-			$jsCode = \str_replace("%identifier%", "#" . $this->identifier, $jsCode);
-			$jsCode = \str_replace("%fireOnInit%", $this->_fireOnInit, $jsCode);
-			$jsCode = \str_replace("%onChange%", $this->_ckItemChange, $jsCode);
+		if ($this->_hasCheckedList===true) {
+			$jsCode=include dirname(__FILE__).'/../../components/jsTemplates/tplCheckedList.php';
+			$jsCode=\str_replace("%identifier%", "#".$this->identifier, $jsCode);
+			$jsCode=\str_replace("%fireOnInit%", $this->_fireOnInit, $jsCode);
+			$jsCode=\str_replace("%onChange%", $this->_ckItemChange, $jsCode);
 			$this->executeOnRun($jsCode);
 		}
 		/*
@@ -106,19 +106,19 @@ 
 	}
 
 	protected function addFollowPoints() {
-		$count = $this->count();
-		for ($i = $this->_maxVisible; $i < $count; $i ++) {
+		$count=$this->count();
+		for ($i=$this->_maxVisible; $i<$count; $i++) {
 			$this->getItem($i)
 				->addClass("notVisible")
 				->setProperty("style", "display: none;");
 		}
-		$item = $this->addItem("...");
+		$item=$this->addItem("...");
 		$item->addClass("points");
-		$item->onClick('$(this).hide();$("#' . $this->identifier . ' .notVisible").show();');
+		$item->onClick('$(this).hide();$("#'.$this->identifier.' .notVisible").show();');
 	}
 
 	public function onCkItemChange($jsCode) {
-		$this->_ckItemChange = $jsCode;
+		$this->_ckItemChange=$jsCode;
 	}
 
 	/**
@@ -126,7 +126,7 @@ 
 	 * @param boolean $fireOnInit
 	 */
 	public function setFireOnInit($fireOnInit) {
-		$this->_fireOnInit = $fireOnInit;
+		$this->_fireOnInit=$fireOnInit;
 	}
 
 	public function setRelaxed() {
@@ -150,15 +150,15 @@ 
 	 * {@inheritdoc}
 	 * @see \Ajax\common\html\HtmlCollection::compile()
 	 */
-	public function compile(JsUtils $js = NULL, &$view = NULL) {
-		if (isset($this->_maxVisible) && $this->_maxVisible < $this->count()) {
+	public function compile(JsUtils $js=NULL, &$view=NULL) {
+		if (isset($this->_maxVisible) && $this->_maxVisible<$this->count()) {
 			$this->addFollowPoints();
 			if (isset($js)) {
-				$visibility = new Visibility($js);
-				$visibility->attach("#" . $this->identifier);
+				$visibility=new Visibility($js);
+				$visibility->attach("#".$this->identifier);
 				$visibility->setOnTopVisible("$(this).children('.notVisible').hide();$(this).find('.points').show();");
 				$visibility->compile($js, $view);
-				$this->_visibility = $visibility;
+				$this->_visibility=$visibility;
 			}
 		}
 		return parent::compile($js, $view);
@@ -173,21 +173,21 @@ 
 	 * @param string $notAllChecked
 	 * @return HtmlList
 	 */
-	public function addCheckedList($items = array(), $masterItem = NULL, $values = array(), $notAllChecked = false, $name = null) {
-		$count = $this->count();
-		$identifier = $this->identifier . "-" . $count;
+	public function addCheckedList($items=array(), $masterItem=NULL, $values=array(), $notAllChecked=false, $name=null) {
+		$count=$this->count();
+		$identifier=$this->identifier."-".$count;
 		if (isset($masterItem)) {
 			if (\is_array($masterItem)) {
-				$masterO = new HtmlFormCheckbox("master-" . $identifier, @$masterItem[0], @$masterItem[1]);
+				$masterO=new HtmlFormCheckbox("master-".$identifier, @$masterItem[0], @$masterItem[1]);
 				if (isset($name))
 					$masterO->setName($name);
 				if (isset($masterItem[1])) {
-					if (\array_search($masterItem[1], $values) !== false) {
+					if (\array_search($masterItem[1], $values)!==false) {
 						$masterO->getDataField()->setProperty("checked", "");
 					}
 				}
 			} else {
-				$masterO = new HtmlFormCheckbox("master-" . $identifier, $masterItem);
+				$masterO=new HtmlFormCheckbox("master-".$identifier, $masterItem);
 			}
 			if ($notAllChecked) {
 				$masterO->getDataField()->addClass("_notAllChecked");
@@ -196,36 +196,36 @@ 
 			$masterO->setClass("item");
 			$this->addItem($masterO);
 		}
-		$fields = array();
-		$i = 0;
-		$this->setFireOnInit(UString::getBooleanStr($this->_fireOnInit || count($items) < 30));
+		$fields=array();
+		$i=0;
+		$this->setFireOnInit(UString::getBooleanStr($this->_fireOnInit || count($items)<30));
 		foreach ($items as $val => $caption) {
-			$itemO = new HtmlFormCheckbox($identifier . "-" . $i ++, $caption, $val, "child");
-			if (\array_search($val, $values) !== false) {
+			$itemO=new HtmlFormCheckbox($identifier."-".$i++, $caption, $val, "child");
+			if (\array_search($val, $values)!==false) {
 				$itemO->getDataField()->setProperty("checked", "");
 			}
 			if (isset($name))
 				$itemO->setName($name);
 			$itemO->setClass("item");
-			$fields[] = $itemO;
+			$fields[]=$itemO;
 		}
-		if (isset($masterO) === true) {
-			$list = new HtmlList("", $fields);
+		if (isset($masterO)===true) {
+			$list=new HtmlList("", $fields);
 			$list->setClass("list");
 			$masterO->addContent($list);
 		} else {
 			$this->addList($fields);
 		}
-		$this->_hasCheckedList = true;
+		$this->_hasCheckedList=true;
 		return $this;
 	}
 
 	public function setIcons($icons) {
-		if (! \is_array($icons)) {
-			$icons = \array_fill(0, \sizeof($this->content), $icons);
+		if (!\is_array($icons)) {
+			$icons=\array_fill(0, \sizeof($this->content), $icons);
 		}
-		$max = \min(\sizeof($icons), \sizeof($this->content));
-		for ($i = 0; $i < $max; $i ++) {
+		$max=\min(\sizeof($icons), \sizeof($this->content));
+		for ($i=0; $i<$max; $i++) {
 			$this->content[$i]->addIcon($icons[$i]);
 		}
 		return $this;
@@ -244,7 +244,7 @@ 
 	 * @param mixed $_maxVisible
 	 */
 	public function setMaxVisible($_maxVisible) {
-		$this->_maxVisible = $_maxVisible;
+		$this->_maxVisible=$_maxVisible;
 		return $this;
 	}
 }

Braces +9 added lines, -6 removed lines

@@ -72,8 +72,9 @@ 
 
 	protected function getItemToAdd($item) {
 		$itemO = parent::getItemToAdd($item);
-		if ($itemO instanceof AbstractCheckbox)
-			$itemO->addClass("item");
+		if ($itemO instanceof AbstractCheckbox) {
+					$itemO->addClass("item");
+		}
 		return $itemO;
 	}
 
@@ -179,8 +180,9 @@ 
 		if (isset($masterItem)) {
 			if (\is_array($masterItem)) {
 				$masterO = new HtmlFormCheckbox("master-" . $identifier, @$masterItem[0], @$masterItem[1]);
-				if (isset($name))
-					$masterO->setName($name);
+				if (isset($name)) {
+									$masterO->setName($name);
+				}
 				if (isset($masterItem[1])) {
 					if (\array_search($masterItem[1], $values) !== false) {
 						$masterO->getDataField()->setProperty("checked", "");
@@ -204,8 +206,9 @@ 
 			if (\array_search($val, $values) !== false) {
 				$itemO->getDataField()->setProperty("checked", "");
 			}
-			if (isset($name))
-				$itemO->setName($name);
+			if (isset($name)) {
+							$itemO->setName($name);
+			}
 			$itemO->setClass("item");
 			$fields[] = $itemO;
 		}

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

Braces +15 added lines, -10 removed lines

@@ -151,25 +151,29 @@ 
 	}
 
 	public function getColPosition($colIndex) {
-		if ($this->_container->_isMerged() !== true)
-			return $colIndex;
+		if ($this->_container->_isMerged() !== true) {
+					return $colIndex;
+		}
 		$pos = 0;
 		$rows = $this->_container->getContent();
 		for ($i = 0; $i < $this->_row; $i ++) {
 			$max = \min($colIndex, $rows[$i]->count());
 			for ($j = 0; $j < $max; $j ++) {
 				$rowspan = $rows[$i]->getItem($j)->getRowspan();
-				if ($rowspan + $i > $this->_row)
-					$pos ++;
+				if ($rowspan + $i > $this->_row) {
+									$pos ++;
+				}
 			}
 		}
-		if ($pos > $colIndex)
-			return NULL;
+		if ($pos > $colIndex) {
+					return NULL;
+		}
 		$count = $this->count();
 		for ($i = 0; $i < $count; $i ++) {
 			$pos += $this->content[$i]->getColspan();
-			if ($pos >= $colIndex + 1)
-				return $i;
+			if ($pos >= $colIndex + 1) {
+							return $i;
+			}
 		}
 		return null;
 	}
@@ -192,8 +196,9 @@ 
 	public function containsStr($needle) {
 		$cells = $this->content;
 		foreach ($cells as $cell) {
-			if (\strpos($cell->getContent(), $needle) !== false)
-				return true;
+			if (\strpos($cell->getContent(), $needle) !== false) {
+							return true;
+			}
 		}
 		return false;
 	}

Spacing +44 added lines, -44 removed lines

@@ -22,7 +22,7 @@ 
 
 	public function __construct($identifier) {
 		parent::__construct($identifier, "tr", "");
-		$this->_states = [
+		$this->_states=[
 			State::ACTIVE,
 			State::POSITIVE,
 			State::NEGATIVE,
@@ -33,9 +33,9 @@ 
 	}
 
 	public function setColCount($colCount) {
-		$count = $this->count();
-		for ($i = $count; $i < $colCount; $i ++) {
-			$item = $this->addItem(NULL);
+		$count=$this->count();
+		for ($i=$count; $i<$colCount; $i++) {
+			$item=$this->addItem(NULL);
 			$item->setTagName($this->_tdTagName);
 		}
 		return $this;
@@ -52,8 +52,8 @@ 
 	 * @see \Ajax\common\html\HtmlCollection::createItem()
 	 */
 	protected function createItem($value) {
-		$count = $this->count();
-		$td = new HtmlTD("", $value, $this->_tdTagName);
+		$count=$this->count();
+		$td=new HtmlTD("", $value, $this->_tdTagName);
 		$td->setContainer($this->_container, $this->_row, $count);
 		return $td;
 	}
@@ -66,8 +66,8 @@ 
 		return parent::getItem($index);
 	}
 
-	public function setTdTagName($tagName = "td") {
-		$this->_tdTagName = $tagName;
+	public function setTdTagName($tagName="td") {
+		$this->_tdTagName=$tagName;
 	}
 
 	/**
@@ -77,8 +77,8 @@ 
 	 * @param int $row
 	 */
 	public function setContainer($container, $row) {
-		$this->_container = $container;
-		$this->_row = $row;
+		$this->_container=$container;
+		$this->_row=$row;
 	}
 
 	/**
@@ -86,8 +86,8 @@ 
 	 *
 	 * @param mixed $values
 	 */
-	public function setValues($values = array()) {
-		return $this->_addOrSetValues($values, function (HtmlTD &$cell, $value) {
+	public function setValues($values=array()) {
+		return $this->_addOrSetValues($values, function(HtmlTD&$cell, $value) {
 			$cell->setValue($value);
 		});
 	}
@@ -97,8 +97,8 @@ 
 	 *
 	 * @param mixed $values
 	 */
-	public function addValues($values = array()) {
-		return $this->_addOrSetValues($values, function (HtmlTD &$cell, $value) {
+	public function addValues($values=array()) {
+		return $this->_addOrSetValues($values, function(HtmlTD&$cell, $value) {
 			$cell->addValue($value);
 		});
 	}
@@ -109,18 +109,18 @@ 
 	 * @param mixed $values
 	 */
 	protected function _addOrSetValues($values, $callback) {
-		$count = $this->count();
-		if (! \is_array($values)) {
-			$values = \array_fill(0, $count, $values);
+		$count=$this->count();
+		if (!\is_array($values)) {
+			$values=\array_fill(0, $count, $values);
 		} else {
-			if (JArray::isAssociative($values) === true) {
-				$values = \array_values($values);
+			if (JArray::isAssociative($values)===true) {
+				$values=\array_values($values);
 			}
 		}
-		$count = \min(\sizeof($values), $count);
+		$count=\min(\sizeof($values), $count);
 
-		for ($i = 0; $i < $count; $i ++) {
-			$cell = $this->content[$i];
+		for ($i=0; $i<$count; $i++) {
+			$cell=$this->content[$i];
 			$callback($cell, $values[$i]);
 		}
 		return $this;
@@ -138,12 +138,12 @@ 
 		return $this;
 	}
 
-	public function mergeCol($colIndex = 0) {
+	public function mergeCol($colIndex=0) {
 		return $this->getItem($colIndex)->mergeCol();
 	}
 
-	public function mergeRow($colIndex = 0) {
-		$row = $this->getItem($colIndex);
+	public function mergeRow($colIndex=0) {
+		$row=$this->getItem($colIndex);
 		if (isset($row)) {
 			$this->getItem($colIndex)->mergeRow();
 		}
@@ -151,31 +151,31 @@ 
 	}
 
 	public function getColPosition($colIndex) {
-		if ($this->_container->_isMerged() !== true)
+		if ($this->_container->_isMerged()!==true)
 			return $colIndex;
-		$pos = 0;
-		$rows = $this->_container->getContent();
-		for ($i = 0; $i < $this->_row; $i ++) {
-			$max = \min($colIndex, $rows[$i]->count());
-			for ($j = 0; $j < $max; $j ++) {
-				$rowspan = $rows[$i]->getItem($j)->getRowspan();
-				if ($rowspan + $i > $this->_row)
-					$pos ++;
+		$pos=0;
+		$rows=$this->_container->getContent();
+		for ($i=0; $i<$this->_row; $i++) {
+			$max=\min($colIndex, $rows[$i]->count());
+			for ($j=0; $j<$max; $j++) {
+				$rowspan=$rows[$i]->getItem($j)->getRowspan();
+				if ($rowspan+$i>$this->_row)
+					$pos++;
 			}
 		}
-		if ($pos > $colIndex)
+		if ($pos>$colIndex)
 			return NULL;
-		$count = $this->count();
-		for ($i = 0; $i < $count; $i ++) {
-			$pos += $this->content[$i]->getColspan();
-			if ($pos >= $colIndex + 1)
+		$count=$this->count();
+		for ($i=0; $i<$count; $i++) {
+			$pos+=$this->content[$i]->getColspan();
+			if ($pos>=$colIndex+1)
 				return $i;
 		}
 		return null;
 	}
 
 	public function conditionalCellFormat($callback, $format) {
-		$cells = $this->content;
+		$cells=$this->content;
 		foreach ($cells as $cell) {
 			$cell->conditionalCellFormat($callback, $format);
 		}
@@ -190,9 +190,9 @@ 
 	}
 
 	public function containsStr($needle) {
-		$cells = $this->content;
+		$cells=$this->content;
 		foreach ($cells as $cell) {
-			if (\strpos($cell->getContent(), $needle) !== false)
+			if (\strpos($cell->getContent(), $needle)!==false)
 				return true;
 		}
 		return false;
@@ -204,7 +204,7 @@ 
 	}
 
 	public function applyCells($callback) {
-		$cells = $this->content;
+		$cells=$this->content;
 		foreach ($cells as $cell) {
 			$cell->apply($callback);
 		}
@@ -217,7 +217,7 @@ 
 	}
 
 	public function toRowspanned($colIndex) {
-		$cell = $this->getItem($colIndex);
+		$cell=$this->getItem($colIndex);
 		$cell->addClass('rowspanned');
 		$cell->setContent('');
 		return $this;

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

Spacing +32 added lines, -32 removed lines

@@ -11,7 +11,7 @@ 
 use Ajax\JsUtils;
 
 class HtmlTD extends HtmlSemDoubleElement {
-	use TextAlignmentTrait,TableElementTrait;
+	use TextAlignmentTrait, TableElementTrait;
 
 	private $_container;
 
@@ -19,11 +19,11 @@ 
 
 	private $_col;
 
-	private $_colMerged = false;
+	private $_colMerged=false;
 
-	private $_rowMerged = false;
+	private $_rowMerged=false;
 
-	private $_deleted = false;
+	private $_deleted=false;
 
 	/**
 	 *
@@ -31,12 +31,12 @@ 
 	 * @param mixed $content
 	 * @param string $tagName
 	 */
-	public function __construct($identifier, $content = NULL, $tagName = "td") {
+	public function __construct($identifier, $content=NULL, $tagName="td") {
 		parent::__construct($identifier, $tagName, "", $content);
-		$this->_variations = [
+		$this->_variations=[
 			Variation::COLLAPSING
 		];
-		$this->_states = [
+		$this->_states=[
 			State::ACTIVE,
 			State::POSITIVE,
 			State::NEGATIVE,
@@ -47,13 +47,13 @@ 
 	}
 
 	public function setContainer($container, $row, $col) {
-		$this->_container = $container;
-		$this->_row = $row;
-		$this->_col = $col;
+		$this->_container=$container;
+		$this->_row=$row;
+		$this->_col=$col;
 	}
 
 	public function setValue($value) {
-		$this->content = $value;
+		$this->content=$value;
 		return $this;
 	}
 
@@ -63,8 +63,8 @@ 
 	}
 
 	public function setRowspan($rowspan) {
-		$to = min($this->_container->count(), $this->_row + $rowspan - 1);
-		for ($i = $to; $i > $this->_row; $i --) {
+		$to=min($this->_container->count(), $this->_row+$rowspan-1);
+		for ($i=$to; $i>$this->_row; $i--) {
 			$this->_container->toDelete($i, $this->_col);
 		}
 		$this->setProperty("rowspan", $rowspan);
@@ -72,8 +72,8 @@ 
 	}
 
 	public function setRowspanned($rowspan) {
-		$to = min($this->_container->count(), $this->_row + $rowspan - 1);
-		for ($i = $to; $i > $this->_row; $i --) {
+		$to=min($this->_container->count(), $this->_row+$rowspan-1);
+		for ($i=$to; $i>$this->_row; $i--) {
 			$this->_container->toRowspanned($i, $this->_col);
 		}
 		$this->setProperty("rowspan", $rowspan);
@@ -81,16 +81,16 @@ 
 	}
 
 	public function mergeRow() {
-		if (! $this->_rowMerged) {
-			$this->_rowMerged = true;
+		if (!$this->_rowMerged) {
+			$this->_rowMerged=true;
 			return $this->setRowspan($this->_container->count());
 		}
 		return $this->_container;
 	}
 
 	public function mergeCol() {
-		if (! $this->_colMerged) {
-			$this->_colMerged = true;
+		if (!$this->_colMerged) {
+			$this->_colMerged=true;
 			return $this->setColspan($this->_container->getRow($this->_row)
 				->count());
 		}
@@ -98,25 +98,25 @@ 
 	}
 
 	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);
+		$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;
 	}
 
 	public function getColspan() {
-		$colspan = 1;
+		$colspan=1;
 		if (\array_key_exists("colspan", $this->properties))
-			$colspan = $this->getProperty("colspan");
+			$colspan=$this->getProperty("colspan");
 		return $colspan;
 	}
 
 	public function getRowspan() {
-		$rowspan = 1;
+		$rowspan=1;
 		if (\array_key_exists("rowspan", $this->properties))
-			$rowspan = $this->getProperty("rowspan");
+			$rowspan=$this->getProperty("rowspan");
 		return $rowspan;
 	}
 
@@ -132,16 +132,16 @@ 
 		return $this;
 	}
 
-	public function setSelectable($href = "#") {
+	public function setSelectable($href="#") {
 		if (\is_string($this->content)) {
-			$this->content = new HtmlLink("", $href, $this->content);
+			$this->content=new HtmlLink("", $href, $this->content);
 		}
 		return $this->addToProperty("class", "selectable");
 	}
 
 	public function setWidth($width) {
 		if (\is_int($width)) {
-			$width = Wide::getConstants()["W" . $width];
+			$width=Wide::getConstants()["W".$width];
 		}
 		$this->addToPropertyCtrl("class", $width, Wide::getConstants());
 		return $this->addToPropertyCtrl("class", "wide", array(
@@ -150,12 +150,12 @@ 
 	}
 
 	public function toDelete() {
-		$this->_deleted = true;
+		$this->_deleted=true;
 		return $this;
 	}
 
-	public function compile(JsUtils $js = NULL, &$view = NULL) {
-		if (! $this->_deleted)
+	public function compile(JsUtils $js=NULL, &$view=NULL) {
+		if (!$this->_deleted)
 			return parent::compile($js, $view);
 	}
 }

Braces +9 added lines, -6 removed lines

@@ -108,15 +108,17 @@ 
 
 	public function getColspan() {
 		$colspan = 1;
-		if (\array_key_exists("colspan", $this->properties))
-			$colspan = $this->getProperty("colspan");
+		if (\array_key_exists("colspan", $this->properties)) {
+					$colspan = $this->getProperty("colspan");
+		}
 		return $colspan;
 	}
 
 	public function getRowspan() {
 		$rowspan = 1;
-		if (\array_key_exists("rowspan", $this->properties))
-			$rowspan = $this->getProperty("rowspan");
+		if (\array_key_exists("rowspan", $this->properties)) {
+					$rowspan = $this->getProperty("rowspan");
+		}
 		return $rowspan;
 	}
 
@@ -155,7 +157,8 @@ 
 	}
 
 	public function compile(JsUtils $js = NULL, &$view = NULL) {
-		if (! $this->_deleted)
-			return parent::compile($js, $view);
+		if (! $this->_deleted) {
+					return parent::compile($js, $view);
+		}
 	}
 }

Ajax/bootstrap/html/HtmlGridSystem.php

Spacing +22 added lines, -22 removed lines

@@ -16,11 +16,11 @@ 
 class HtmlGridSystem extends HtmlBsDoubleElement {
 	private $rows;
 	
-	public function __construct($identifier,$numRows=1,$numCols=NULL){
-		parent::__construct($identifier,"div");
+	public function __construct($identifier, $numRows=1, $numCols=NULL) {
+		parent::__construct($identifier, "div");
 		$this->setProperty("class", "container-fluid");
 		$this->rows=array();
-		$this->setNumRows($numRows,$numCols);
+		$this->setNumRows($numRows, $numCols);
 	}
 	
 	/**
@@ -28,8 +28,8 @@ 
 	 * @param int $numCols 
 	 * @return \Ajax\bootstrap\html\content\HtmlGridRow
 	 */
-	public function addRow($numCols=NULL){
-		$row=new HtmlGridRow($this->identifier."-row-".(sizeof($this->rows)+1),$numCols);
+	public function addRow($numCols=NULL) {
+		$row=new HtmlGridRow($this->identifier."-row-".(sizeof($this->rows)+1), $numCols);
 		$this->rows[]=$row;
 		return $row;
 	}
@@ -40,10 +40,10 @@ 
 	 * @param boolean $force add the row at $index if true
 	 * @return \Ajax\bootstrap\html\content\HtmlGridRow
 	 */
-	public function getRow($index,$force=true){
-		if($index<sizeof($this->rows)){
+	public function getRow($index, $force=true) {
+		if ($index<sizeof($this->rows)) {
 			$result=$this->rows[$index-1];
-		}else if ($force){
+		} else if ($force) {
 			$this->setNumRows($index);
 			$result=$this->rows[$index-1];
 		}
@@ -56,8 +56,8 @@ 
 	 * @param int $numCols
 	 * @return \Ajax\bootstrap\html\HtmlGridSystem
 	 */
-	public function setNumRows($numRows,$numCols=NULL){
-		for($i=sizeof($this->rows);$i<$numRows;$i++){
+	public function setNumRows($numRows, $numCols=NULL) {
+		for ($i=sizeof($this->rows); $i<$numRows; $i++) {
 			$this->addRow($numCols);
 		}
 		return $this;
@@ -69,10 +69,10 @@ 
 	 * @param boolean $force add the cell at $row,$col if true
 	 * @return HtmlGridCol
 	 */
-	public function getCell($row,$col,$force=true){
-		$row=$this->getRow($row,$force);
-		if(isset($row)){
-			$col=$row->getCol($col,$force);
+	public function getCell($row, $col, $force=true) {
+		$row=$this->getRow($row, $force);
+		if (isset($row)) {
+			$col=$row->getCol($col, $force);
 		}
 		return $col;
 	}
@@ -82,22 +82,22 @@ 
 	 * @param int $col
 	 * @return HtmlGridCol
 	 */
-	public function getCellAt($row,$col,$force=true){
-		$row=$this->getRow($row,$force);
-		if(isset($row)){
-			$col=$row->getColAt($col,$force);
+	public function getCellAt($row, $col, $force=true) {
+		$row=$this->getRow($row, $force);
+		if (isset($row)) {
+			$col=$row->getColAt($col, $force);
 		}
 		return $col;
 	}
 	
 	public function compile(JsUtils $js=NULL, &$view=NULL) {
-		foreach ($this->rows as $row){
+		foreach ($this->rows as $row) {
 			$this->addContent($row);
 		}
-		return parent::compile($js,$view);
+		return parent::compile($js, $view);
 	}
-	public function setContentForAll($content){
-		foreach ($this->rows as $row){
+	public function setContentForAll($content) {
+		foreach ($this->rows as $row) {
 			$row->setContentForAll($content);
 		}
 	}

Braces +1 added lines, -1 removed lines

@@ -43,7 +43,7 @@
 	public function getRow($index,$force=true){
 		if($index<sizeof($this->rows)){
 			$result=$this->rows[$index-1];
-		}else if ($force){
+		} else if ($force){
 			$this->setNumRows($index);
 			$result=$this->rows[$index-1];
 		}

Ajax/ui/components/Tabs.php

Spacing +1 added lines, -1 removed lines

@@ -14,6 +14,6 @@
 
 	public function __construct(JsUtils $js) {
 		parent::__construct($js);
-		$this->uiName = "tabs";
+		$this->uiName="tabs";
 	}
 }

Ajax/ui/components/Autocomplete.php

Spacing +5 added lines, -5 removed lines

@@ -16,7 +16,7 @@ 
 
 	public function __construct(JsUtils $js) {
 		parent::__construct($js);
-		$this->uiName = "autocomplete";
+		$this->uiName="autocomplete";
 		$this->setParam("minLength", 3);
 	}
 
@@ -29,9 +29,9 @@ 
 	 */
 	public function setAjaxSource($url) {
 		if (JString::startsWith($url, "/")) {
-			$url = $this->js->getUrl($url);
+			$url=$this->js->getUrl($url);
 		}
-		$ajax = "%function (request, response) {
+		$ajax="%function (request, response) {
 			$.ajax({
 				url: '{$url}',
 				dataType: 'jsonp',
@@ -52,11 +52,11 @@ 
 	 * @return $this
 	 */
 	public function setSource($source) {
-		$source = str_ireplace(array(
+		$source=str_ireplace(array(
 			"\"",
 			"'"
 		), "%quote%", $source);
-		return $this->setParam("source", "%" . $source . "%");
+		return $this->setParam("source", "%".$source."%");
 	}
 
 	/**

Ajax/ui/components/Button.php

Spacing +2 added lines, -2 removed lines

@@ -15,7 +15,7 @@ 
 
 	public function __construct(JsUtils $js) {
 		parent::__construct($js);
-		$this->uiName = "button";
+		$this->uiName="button";
 	}
 
 	/**
@@ -43,7 +43,7 @@ 
 	public function setIcons($value) {
 		if (is_string($value)) {
 			if (JString::startsWith($value, "{"));
-			$value = "%" . $value . "%";
+			$value="%".$value."%";
 		}
 		return $this->setParam("icons", $value);
 	}

Ajax/ui/components/Dialog.php

Spacing +20 added lines, -20 removed lines

@@ -14,29 +14,29 @@ 
 
 	protected $attachTo;
 
-	protected $buttons = array();
+	protected $buttons=array();
 
 	public function __construct(JsUtils $js) {
 		parent::__construct($js);
-		$this->params = array(
+		$this->params=array(
 			"dialogClass" => "no-close"
 		);
 		$this->addCancelBtn("Annuler");
 	}
 
 	public function getScript() {
-		$allParams = $this->params;
-		$jsonButtons = array();
+		$allParams=$this->params;
+		$jsonButtons=array();
 		foreach ($this->buttons as $button) {
-			$jsonButtons[] = $button->getParams();
+			$jsonButtons[]=$button->getParams();
 		}
-		$allParams["buttons"] = $jsonButtons;
-		$this->jquery_code_for_compile[] = "$( '" . $this->attachTo . "' ).dialog(" . $this->getParamsAsJSON($allParams) . ");";
-		$result = implode("", $this->jquery_code_for_compile);
-		$result = str_ireplace("\"%", "", $result);
-		$result = str_ireplace("%\"", "", $result);
-		$result = str_ireplace("\\n", "", $result);
-		$result = str_ireplace("\\t", "", $result);
+		$allParams["buttons"]=$jsonButtons;
+		$this->jquery_code_for_compile[]="$( '".$this->attachTo."' ).dialog(".$this->getParamsAsJSON($allParams).");";
+		$result=implode("", $this->jquery_code_for_compile);
+		$result=str_ireplace("\"%", "", $result);
+		$result=str_ireplace("%\"", "", $result);
+		$result=str_ireplace("\\n", "", $result);
+		$result=str_ireplace("\\t", "", $result);
 		return $result;
 	}
 
@@ -46,26 +46,26 @@ 
 	 *        	identifiant CSS
 	 */
 	public function attach($identifier) {
-		$this->attachTo = $identifier;
+		$this->attachTo=$identifier;
 	}
 
-	public function addCancelBtn($caption = "Annuler", $position = NULL) {
+	public function addCancelBtn($caption="Annuler", $position=NULL) {
 		$this->insertBtn(DialogButton::cancelButton($caption), $position);
 	}
 
-	public function addSubmitBtn(JsUtils $js, $url, $form, $responseElement, $caption = "Valider", $position = NULL) {
+	public function addSubmitBtn(JsUtils $js, $url, $form, $responseElement, $caption="Valider", $position=NULL) {
 		$this->insertBtn(DialogButton::submitButton($js, $url, $form, $responseElement, $caption), $position);
 	}
 
-	public function addButton($caption, $jsCode, $position = NULL) {
+	public function addButton($caption, $jsCode, $position=NULL) {
 		$this->insertBtn(new DialogButton($caption, $jsCode), $position);
 	}
 
-	private function insertBtn($insert, $position = NULL) {
-		if ($position != NULL) {
-			$this->buttons = array_splice($this->buttons, $position, 0, $insert);
+	private function insertBtn($insert, $position=NULL) {
+		if ($position!=NULL) {
+			$this->buttons=array_splice($this->buttons, $position, 0, $insert);
 		} else {
-			$this->buttons[] = $insert;
+			$this->buttons[]=$insert;
 		}
 	}
 }

Ajax/ui/components/Spinner.php

Spacing +1 added lines, -1 removed lines

@@ -14,6 +14,6 @@
 
 	public function __construct(JsUtils $js) {
 		parent::__construct($js);
-		$this->uiName = "spinner";
+		$this->uiName="spinner";
 	}
 }