phpMv / phpMv-UI

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

Spacing +46 added lines, -46 removed lines

@@ -14,7 +14,7 @@ 
  *
  */
 class HtmlTableContent extends HtmlSemCollection {
-	protected $_tdTagNames=[ "thead" => "th","tbody" => "td","tfoot" => "th" ];
+	protected $_tdTagNames=["thead" => "th", "tbody" => "td", "tfoot" => "th"];
 	protected $_merged=false;
 
 	/**
@@ -38,7 +38,7 @@ 
 	 */
 	public function setRowCount($rowCount, $colCount) {
 		$count=$this->count();
-		for($i=$count; $i < $rowCount; $i++) {
+		for ($i=$count; $i<$rowCount; $i++) {
 			$this->addItem($colCount);
 		}
 		return $this;
@@ -60,7 +60,7 @@ 
 		$tr=new HtmlTR("");
 		$tr->setContainer($this, $count);
 		$tr->setTdTagName($this->_tdTagNames[$this->tagName]);
-		if (isset($value) === true) {
+		if (isset($value)===true) {
 			$tr->setColCount($value);
 		}
 		return $tr;
@@ -86,10 +86,10 @@ 
 		return $this->addItem($row);
 	}
 	
-	public function addMergeRow($colCount,$value=null){
+	public function addMergeRow($colCount, $value=null) {
 		$row=$this->addRow($colCount);
 		$row->mergeCol();
-		if(isset($value)){
+		if (isset($value)) {
 			$row->setValues([$value]);
 		}
 		return $row;
@@ -98,7 +98,7 @@ 
 	/**
 	 * @return HtmlTR
 	 */
-	public function getItem($index){
+	public function getItem($index) {
 		return parent::getItem($index);
 	}
 
@@ -112,7 +112,7 @@ 
 		$row=$this->getItem($row);
 		if (isset($row) && $row instanceof HtmlCollection) {
 			$col=$row->getItem($col);
-		}else{
+		} else {
 			$col=$row;
 		}
 		return $col;
@@ -136,7 +136,7 @@ 
 	 */
 	public function setCellValue($row, $col, $value="") {
 		$cell=$this->getCell($row, $col);
-		if (isset($cell) === true) {
+		if (isset($cell)===true) {
 			$cell->setValue($value);
 		}
 		return $this;
@@ -147,7 +147,7 @@ 
 	 * @param mixed $values
 	 */
 	public function setValues($values=array()) {
-		return $this->_addOrSetValues($values, function(HtmlTR $row,$_values){$row->setValues($_values);});
+		return $this->_addOrSetValues($values, function(HtmlTR $row, $_values) {$row->setValues($_values); });
 	}
 
 	/**
@@ -155,7 +155,7 @@ 
 	 * @param mixed $values
 	 */
 	public function addValues($values=array()) {
-		return $this->_addOrSetValues($values, function(HtmlTR $row,$_values){$row->addValues($_values);});
+		return $this->_addOrSetValues($values, function(HtmlTR $row, $_values) {$row->addValues($_values); });
 	}
 
 	/**
@@ -163,21 +163,21 @@ 
 	 * @param mixed $values
 	 * @param callable $callback
 	 */
-	protected function _addOrSetValues($values,$callback) {
+	protected function _addOrSetValues($values, $callback) {
 		$count=$this->count();
 		$isArray=true;
 		if (!\is_array($values)) {
 			$values=\array_fill(0, $count, $values);
 			$isArray=false;
 		}
-		if (JArray::dimension($values) == 1 && $isArray)
-			$values=[ $values ];
+		if (JArray::dimension($values)==1 && $isArray)
+			$values=[$values];
 
 		$count=\min(\sizeof($values), $count);
 
-		for($i=0; $i < $count; $i++) {
+		for ($i=0; $i<$count; $i++) {
 			$row=$this->content[$i];
-			$callback($row,$values[$i]);
+			$callback($row, $values[$i]);
 		}
 		return $this;
 	}
@@ -188,7 +188,7 @@ 
 			$values=\array_fill(0, $count, $values);
 		}
 		$count=\min(\sizeof($values), $count);
-		for($i=0; $i < $count; $i++) {
+		for ($i=0; $i<$count; $i++) {
 			$this->getCell($i, $colIndex)->setValue($values[$i]);
 		}
 		return $this;
@@ -196,9 +196,9 @@ 
 
 	public function addColVariations($colIndex, $variations=array()) {
 		$count=$this->count();
-		for($i=0; $i < $count; $i++) {
+		for ($i=0; $i<$count; $i++) {
 			$cell=$this->getCell($i, $colIndex);
-			if($cell instanceof BaseTrait)
+			if ($cell instanceof BaseTrait)
 				$cell->addVariations($variations);
 		}
 		return $this;
@@ -215,9 +215,9 @@ 
 
 	private function colAlign($colIndex, $function) {
 		$count=$this->count();
-		for($i=0; $i < $count; $i++) {
+		for ($i=0; $i<$count; $i++) {
 			$index=$this->content[$i]->getColPosition($colIndex);
-			if ($index !== NULL)
+			if ($index!==NULL)
 				$this->getCell($i, $index)->$function();
 		}
 		return $this;
@@ -225,11 +225,11 @@ 
 	
 	private function colAlignFromRight($colIndex, $function) {
 		$count=$this->count();
-		for($i=0; $i < $count; $i++) {
+		for ($i=0; $i<$count; $i++) {
 			$maxRow=$this->content[$i]->count();
 			$index=$maxRow-$colIndex-1;
-			if (($cell=$this->getCell($i, $index))!== NULL){
-				if($cell->getColspan()==1)
+			if (($cell=$this->getCell($i, $index))!==NULL) {
+				if ($cell->getColspan()==1)
 					$cell->$function();
 			}
 		}
@@ -274,7 +274,7 @@ 
 	 */
 	public function getColCount() {
 		$result=0;
-		if ($this->count() > 0)
+		if ($this->count()>0)
 			$result=$this->getItem(0)->count();
 		return $result;
 	}
@@ -288,7 +288,7 @@ 
 	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 {
@@ -297,9 +297,9 @@ 
 		return $this;
 	}
 
-	public function toDelete($rowIndex, $colIndex){
+	public function toDelete($rowIndex, $colIndex) {
 		$row=$this->getItem($rowIndex);
-		if (isset($row) === true)
+		if (isset($row)===true)
 			$row->toDelete($colIndex);
 		return $this;
 	}
@@ -328,17 +328,17 @@ 
 	 */
 	public function conditionalCellFormat($callback, $format) {
 		$rows=$this->content;
-		foreach ( $rows as $row ) {
+		foreach ($rows as $row) {
 			$row->conditionalCellFormat($callback, $format);
 		}
 		return $this;
 	}
 
-	public function conditionalColFormat($colIndex,$callback,$format){
+	public function conditionalColFormat($colIndex, $callback, $format) {
 		$rows=$this->content;
-		foreach ( $rows as $row ) {
+		foreach ($rows as $row) {
 			$cell=$row->getItem($colIndex);
-			$cell->conditionnalCellFormat($callback,$format);
+			$cell->conditionnalCellFormat($callback, $format);
 		}
 		return $this;
 	}
@@ -350,17 +350,17 @@ 
 	 */
 	public function conditionalRowFormat($callback, $format) {
 		$rows=$this->content;
-		foreach ( $rows as $row ) {
+		foreach ($rows as $row) {
 			$row->conditionalRowFormat($callback, $format);
 		}
 		return $this;
 	}
 
-	public function hideColumn($colIndex){
+	public function hideColumn($colIndex) {
 		$rows=$this->content;
-		foreach ( $rows as $row ) {
+		foreach ($rows as $row) {
 			$cell=$row->getItem($colIndex);
-			$cell->addToProperty("style","display:none;");
+			$cell->addToProperty("style", "display:none;");
 		}
 		return $this;
 	}
@@ -371,7 +371,7 @@ 
 	 */
 	public function applyCells($callback) {
 		$rows=$this->content;
-		foreach ( $rows as $row ) {
+		foreach ($rows as $row) {
 			$row->applyCells($callback);
 		}
 		return $this;
@@ -383,25 +383,25 @@ 
 	 */
 	public function applyRows($callback) {
 		$rows=$this->content;
-		foreach ( $rows as $row ) {
+		foreach ($rows as $row) {
 			$row->apply($callback);
 		}
 		return $this;
 	}
 
-	public function mergeIdentiqualValues($colIndex,$function="strip_tags"){
+	public function mergeIdentiqualValues($colIndex, $function="strip_tags") {
 		$rows=$this->content;
 		$identiqual=null;
 		$counter=0;
 		$cellToMerge=null;
 		$functionExists=\function_exists($function);
-		foreach ( $rows as $row ) {
+		foreach ($rows as $row) {
 			$cell=$row->getItem($colIndex);
 			$value=$cell->getContent();
-			if($functionExists)
-				$value=\call_user_func($function,$value);
-			if($value!==$identiqual){
-				if($counter>0 && isset($cellToMerge)){
+			if ($functionExists)
+				$value=\call_user_func($function, $value);
+			if ($value!==$identiqual) {
+				if ($counter>0 && isset($cellToMerge)) {
 					$cellToMerge->setRowspan($counter);
 				}
 				$counter=0;
@@ -410,17 +410,17 @@ 
 			}
 			$counter++;
 		}
-		if($counter>0 && isset($cellToMerge)){
+		if ($counter>0 && isset($cellToMerge)) {
 			$cellToMerge->setRowspan($counter);
 		}
 		return $this;
 	}
 
-	public function _isMerged(){
+	public function _isMerged() {
 		return $this->_merged;
 	}
 
-	public function _setMerged($value){
+	public function _setMerged($value) {
 		$this->_merged=$value;
 		return $this;
 	}

Braces +25 added lines, -17 removed lines

@@ -26,8 +26,9 @@ 
 	 */
 	public function __construct($identifier, $tagName="tbody", $rowCount=NULL, $colCount=NULL) {
 		parent::__construct($identifier, $tagName, "");
-		if (isset($rowCount) && isset($colCount))
-			$this->setRowCount($rowCount, $colCount);
+		if (isset($rowCount) && isset($colCount)) {
+					$this->setRowCount($rowCount, $colCount);
+		}
 	}
 
 	/**
@@ -112,7 +113,7 @@ 
 		$row=$this->getItem($row);
 		if (isset($row) && $row instanceof HtmlCollection) {
 			$col=$row->getItem($col);
-		}else{
+		} else{
 			$col=$row;
 		}
 		return $col;
@@ -170,8 +171,9 @@ 
 			$values=\array_fill(0, $count, $values);
 			$isArray=false;
 		}
-		if (JArray::dimension($values) == 1 && $isArray)
-			$values=[ $values ];
+		if (JArray::dimension($values) == 1 && $isArray) {
+					$values=[ $values ];
+		}
 
 		$count=\min(\sizeof($values), $count);
 
@@ -198,8 +200,9 @@ 
 		$count=$this->count();
 		for($i=0; $i < $count; $i++) {
 			$cell=$this->getCell($i, $colIndex);
-			if($cell instanceof BaseTrait)
-				$cell->addVariations($variations);
+			if($cell instanceof BaseTrait) {
+							$cell->addVariations($variations);
+			}
 		}
 		return $this;
 	}
@@ -217,8 +220,9 @@ 
 		$count=$this->count();
 		for($i=0; $i < $count; $i++) {
 			$index=$this->content[$i]->getColPosition($colIndex);
-			if ($index !== NULL)
-				$this->getCell($i, $index)->$function();
+			if ($index !== NULL) {
+							$this->getCell($i, $index)->$function();
+			}
 		}
 		return $this;
 	}
@@ -229,8 +233,9 @@ 
 			$maxRow=$this->content[$i]->count();
 			$index=$maxRow-$colIndex-1;
 			if (($cell=$this->getCell($i, $index))!== NULL){
-				if($cell->getColspan()==1)
-					$cell->$function();
+				if($cell->getColspan()==1) {
+									$cell->$function();
+				}
 			}
 		}
 		return $this;
@@ -274,8 +279,9 @@ 
 	 */
 	public function getColCount() {
 		$result=0;
-		if ($this->count() > 0)
-			$result=$this->getItem(0)->count();
+		if ($this->count() > 0) {
+					$result=$this->getItem(0)->count();
+		}
 		return $result;
 	}
 
@@ -299,8 +305,9 @@ 
 
 	public function toDelete($rowIndex, $colIndex){
 		$row=$this->getItem($rowIndex);
-		if (isset($row) === true)
-			$row->toDelete($colIndex);
+		if (isset($row) === true) {
+					$row->toDelete($colIndex);
+		}
 		return $this;
 	}
 
@@ -398,8 +405,9 @@ 
 		foreach ( $rows as $row ) {
 			$cell=$row->getItem($colIndex);
 			$value=$cell->getContent();
-			if($functionExists)
-				$value=\call_user_func($function,$value);
+			if($functionExists) {
+							$value=\call_user_func($function,$value);
+			}
 			if($value!==$identiqual){
 				if($counter>0 && isset($cellToMerge)){
 					$cellToMerge->setRowspan($counter);

Ajax/semantic/html/collections/table/HtmlTable.php

Spacing +48 added lines, -48 removed lines

@@ -31,10 +31,10 @@ 
 
 	public function __construct($identifier, $rowCount, $colCount) {
 		parent::__construct($identifier, "table", "ui table");
-		$this->content=array ();
+		$this->content=array();
 		$this->setRowCount($rowCount, $colCount);
-		$this->_variations=[ Variation::CELLED,Variation::PADDED,Variation::COMPACT ];
-		$this->_compileParts=["thead","tbody","tfoot"];
+		$this->_variations=[Variation::CELLED, Variation::PADDED, Variation::COMPACT];
+		$this->_compileParts=["thead", "tbody", "tfoot"];
 		$this->_afterCompileEvents=[];
 	}
 
@@ -44,17 +44,17 @@ 
 	 * @return HtmlTableContent
 	 */
 	public function getPart($key) {
-		if (\array_key_exists($key, $this->content) === false) {
+		if (\array_key_exists($key, $this->content)===false) {
 			$this->content[$key]=new HtmlTableContent("", $key);
-			if ($key !== "tbody") {
+			if ($key!=="tbody") {
 				$this->content[$key]->setRowCount(1, $this->_colCount);
 			}
 		}
 		return $this->content[$key];
 	}
 
-	protected function _getFirstPart(){
-		if(isset($this->content["thead"])){
+	protected function _getFirstPart() {
+		if (isset($this->content["thead"])) {
 			return $this->content["thead"];
 		}
 		return $this->content["tbody"];
@@ -99,7 +99,7 @@ 
 	 * @return boolean
 	 */
 	public function hasPart($key) {
-		return \array_key_exists($key, $this->content) === true;
+		return \array_key_exists($key, $this->content)===true;
 	}
 
 	/**
@@ -259,8 +259,8 @@ 
 		return $this->colAlign($colIndex, "colLeftFromRight");
 	}
 
-	public function setColAlignment($colIndex,$alignment){
-		switch ($alignment){
+	public function setColAlignment($colIndex, $alignment) {
+		switch ($alignment) {
 			case TextAlignment::LEFT:
 				$function="colLeft";
 				break;
@@ -280,8 +280,8 @@ 
 		return $this;
 	}
 	
-	public function setColAlignmentFromRight($colIndex,$alignment){
-		switch ($alignment){
+	public function setColAlignmentFromRight($colIndex, $alignment) {
+		switch ($alignment) {
 			case TextAlignment::LEFT:
 				$function="colLeftFromRight";
 				break;
@@ -303,7 +303,7 @@ 
 
 	private function colAlign($colIndex, $function) {
 		if (\is_array($colIndex)) {
-			foreach ( $colIndex as $cIndex ) {
+			foreach ($colIndex as $cIndex) {
 				$this->colAlign($cIndex, $function);
 			}
 		} else {
@@ -364,7 +364,7 @@ 
 	 * @see HtmlSemDoubleElement::compile()
 	 */
 	public function compile(JsUtils $js=NULL, &$view=NULL) {
-		if(\sizeof($this->_compileParts)<3){
+		if (\sizeof($this->_compileParts)<3) {
 			$this->_template="%content%";
 			$this->refresh($js);
 		}
@@ -373,9 +373,9 @@ 
 	}
 
 	protected function compile_once(JsUtils $js=NULL, &$view=NULL) {
-		parent::compile_once($js,$view);
+		parent::compile_once($js, $view);
 		if ($this->propertyContains("class", "sortable")) {
-			$this->addEvent("execute", "$('#" . $this->identifier . "').tablesort().data('tablesort').sort($('th.default-sort'));");
+			$this->addEvent("execute", "$('#".$this->identifier."').tablesort().data('tablesort').sort($('th.default-sort'));");
 		}
 	}
 
@@ -388,13 +388,13 @@ 
 	public function fromDatabaseObject($object, $function) {
 		$result=$function($object);
 		if (\is_array($result)) {
-			$result= $this->addRow($function($object));
+			$result=$this->addRow($function($object));
 		} else {
-			$result= $this->getBody()->_addRow($result);
+			$result=$this->getBody()->_addRow($result);
 		}
-		if(isset($this->_afterCompileEvents["onNewRow"])){
-			if(\is_callable($this->_afterCompileEvents["onNewRow"]))
-				$this->_afterCompileEvents["onNewRow"]($result,$object);
+		if (isset($this->_afterCompileEvents["onNewRow"])) {
+			if (\is_callable($this->_afterCompileEvents["onNewRow"]))
+				$this->_afterCompileEvents["onNewRow"]($result, $object);
 		}
 		return $result;
 	}
@@ -409,21 +409,21 @@ 
 		return $this;
 	}
 
-	public function refresh($js){
+	public function refresh($js) {
 		$this->_footer=$this->getFooter();
-		if(isset($js)){
-			$js->exec('$("#'.$this->identifier.' tfoot").replaceWith("'.\addslashes($this->_footer).'");',true);
+		if (isset($js)) {
+			$js->exec('$("#'.$this->identifier.' tfoot").replaceWith("'.\addslashes($this->_footer).'");', true);
 		}
 	}
 
-	public function run(JsUtils $js){
-		if(!$this->_runned){
-			if(isset($this->_activeRowSelector)){
+	public function run(JsUtils $js) {
+		if (!$this->_runned) {
+			if (isset($this->_activeRowSelector)) {
 				$this->_activeRowSelector->run();
 			}
 		}
-		$result= parent::run($js);
-		if(isset($this->_footer))
+		$result=parent::run($js);
+		if (isset($this->_footer))
 			$this->_footer->run($js);
 		$this->_runned=true;
 		return $result;
@@ -447,47 +447,47 @@ 
 	 * @param boolean $multiple
 	 * @return HtmlTable
 	 */
-	public function setActiveRowSelector($class="active",$event="click",$multiple=false){
-		$this->_activeRowSelector=new ActiveRow($this,$class,$event,$multiple);
+	public function setActiveRowSelector($class="active", $event="click", $multiple=false) {
+		$this->_activeRowSelector=new ActiveRow($this, $class, $event, $multiple);
 		return $this;
 	}
 
-	public function hideColumn($colIndex){
-		if(isset($this->content["thead"])){
+	public function hideColumn($colIndex) {
+		if (isset($this->content["thead"])) {
 			$this->content["thead"]->hideColumn($colIndex);
 		}
 		$this->content["tbody"]->hideColumn($colIndex);
-		if(isset($this->content["tfoot"])){
+		if (isset($this->content["tfoot"])) {
 			$this->content["tfoot"]->hideColumn($colIndex);
 		}
 		return $this;
 	}
 
-	public function setColWidth($colIndex,$width){
+	public function setColWidth($colIndex, $width) {
 		$part=$this->_getFirstPart();
-		if($part!==null && $part->count()>0)
+		if ($part!==null && $part->count()>0)
 			$part->getCell(0, $colIndex)->setWidth($width);
 		return $this;
 	}
 
-	public function setColWidths($widths){
+	public function setColWidths($widths) {
 		$part=$this->_getFirstPart();
-		if($part!==null && $part->count()>0){
+		if ($part!==null && $part->count()>0) {
 			$count=$part->getColCount();
-			if(!\is_array($widths)){
+			if (!\is_array($widths)) {
 				$widths=\array_fill(0, $count, $widths);
 			}
-			$max=\min(\sizeof($widths),$count);
-			for($i=0;$i<$max;$i++){
+			$max=\min(\sizeof($widths), $count);
+			for ($i=0; $i<$max; $i++) {
 				$part->getCell(0, $i)->setWidth($widths[$i]);
 			}
 		}
 		return $this;
 	}
 
-	public function mergeIdentiqualValues($colIndex,$function="strip_tags"){
+	public function mergeIdentiqualValues($colIndex, $function="strip_tags") {
 		$body=$this->getBody();
-		$body->mergeIdentiqualValues($colIndex,$function);
+		$body->mergeIdentiqualValues($colIndex, $function);
 		return $this;
 	}
 	/**
@@ -501,16 +501,16 @@ 
 	 * @param mixed $_innerScript
 	 */
 	public function setInnerScript($_innerScript) {
-		$this->_innerScript = $_innerScript;
+		$this->_innerScript=$_innerScript;
 	}
 	
-	public function onActiveRowChange($jsCode){
-		$this->on("activeRowChange",$jsCode);
+	public function onActiveRowChange($jsCode) {
+		$this->on("activeRowChange", $jsCode);
 		return $this;
 	}
 	
-	public function addMergeRow($colCount,$value=null){
-		return $this->getBody()->addMergeRow($colCount,$value);
+	public function addMergeRow($colCount, $value=null) {
+		return $this->getBody()->addMergeRow($colCount, $value);
 	}
 
 }

Ajax/semantic/widgets/datatable/JsonDataTable.php

Spacing +32 added lines, -32 removed lines

@@ -22,25 +22,25 @@ 
 		$this->_rowClass="_json _element";
 	}
 
-	protected function _generateContent($table){
+	protected function _generateContent($table) {
 		$this->_addRowModel($table);
 		parent::_generateContent($table);
 	}
 
-	protected function _addRowModel($table){
+	protected function _addRowModel($table) {
 		$fields=$this->_instanceViewer->getSimpleProperties();
-		$row=$this->_createRow($table, $this->_modelClass,$fields);
-		$row->setProperty("style","display:none;");
+		$row=$this->_createRow($table, $this->_modelClass, $fields);
+		$row->setProperty("style", "display:none;");
 		$table->getBody()->_addRow($row);
 	}
 
-	protected function _createRow($table,$rowClass,$fields){
+	protected function _createRow($table, $rowClass, $fields) {
 		$object=JReflection::jsonObject($this->_model);
-		if(isset($this->_rowModelCallback)){
+		if (isset($this->_rowModelCallback)) {
 			$callback=$this->_rowModelCallback;
 			$callback($object);
 		}
-		$row=$this->_generateRow($object, $fields,$table,"_jsonArrayChecked");
+		$row=$this->_generateRow($object, $fields, $table, "_jsonArrayChecked");
 		$row->setClass($rowClass." _element");
 		return $row;
 	}
@@ -49,24 +49,24 @@ 
 	 * {@inheritDoc}
 	 * @see DataTable::_associatePaginationBehavior()
 	 */
-	protected function _associatePaginationBehavior(JsUtils $js=NULL,$offset=null){
+	protected function _associatePaginationBehavior(JsUtils $js=NULL, $offset=null) {
 		$callback=null;
 		$menu=$this->_pagination->getMenu();
 		
-		if(isset($js)){
+		if (isset($js)) {
 			$id=$this->identifier;
 			$callback=$js->getScript($offset).$this->getHtmlComponent()->getInnerScript();
-			$callback.=$js->trigger("#".$id." [name='selection[]']","change",false)."$('#".$id." tbody .ui.checkbox').checkbox();".$js->execOn("change", "#".$id." [name='selection[]']", $this->_getCheckedChange($js));
+			$callback.=$js->trigger("#".$id." [name='selection[]']", "change", false)."$('#".$id." tbody .ui.checkbox').checkbox();".$js->execOn("change", "#".$id." [name='selection[]']", $this->_getCheckedChange($js));
 			$callback.=$this->_generatePaginationScript($id);
-			if(isset($this->_urls["refresh"])){
-				if(isset($menu))
-				$js->jsonArrayOn("click", "#".$menu->getIdentifier()." a","#".$this->_identifier." tr.".$this->_modelClass, $this->_urls["refresh"],"post",["params"=>"{'p':$(this).attr('data-page'),'_model':'".JString::doubleBackSlashes($this->_model)."'}","jsCallback"=>$callback]);
+			if (isset($this->_urls["refresh"])) {
+				if (isset($menu))
+				$js->jsonArrayOn("click", "#".$menu->getIdentifier()." a", "#".$this->_identifier." tr.".$this->_modelClass, $this->_urls["refresh"], "post", ["params"=>"{'p':$(this).attr('data-page'),'_model':'".JString::doubleBackSlashes($this->_model)."'}", "jsCallback"=>$callback]);
 			}
 		}
 
 	}
 	
-	protected function _generatePaginationScript($id){
+	protected function _generatePaginationScript($id) {
 		return ";var page=parseInt($(self).attr('data-page')) || 1;var pages_visibles=$('#pagination-{$id} .item').length-2;
 			var lastPage=$('#pagination-{$id} ._lastPage');
 			var middle= Math.ceil((pages_visibles-1)/ 2);
@@ -86,16 +86,16 @@ 
 			lastPage.attr('data-page',Math.min(lastPage.attr('data-max'),page+1));
 			$('#{$id}').trigger('pageChange');$('#{$id}').trigger('activeRowChange');$('#pagination-{$id}').show();";
 	}
-	protected function _compileSearchFieldBehavior(JsUtils $js=NULL){
+	protected function _compileSearchFieldBehavior(JsUtils $js=NULL) {
 		
 	}
-	protected function _associateSearchFieldBehavior(JsUtils $js=NULL,$offset=null){
-		if(isset($this->_searchField) && isset($js) && isset($this->_urls["refresh"])){
+	protected function _associateSearchFieldBehavior(JsUtils $js=NULL, $offset=null) {
+		if (isset($this->_searchField) && isset($js) && isset($this->_urls["refresh"])) {
 			$id=$this->identifier;
 			$callback=$js->getScript($offset).$this->getHtmlComponent()->getInnerScript();
-			$callback.=$js->trigger("#".$id." [name='selection[]']","change",false)."$('#".$id." tbody .ui.checkbox').checkbox();".$js->execOn("change", "#".$id." [name='selection[]']", $this->_getCheckedChange($js));
+			$callback.=$js->trigger("#".$id." [name='selection[]']", "change", false)."$('#".$id." tbody .ui.checkbox').checkbox();".$js->execOn("change", "#".$id." [name='selection[]']", $this->_getCheckedChange($js));
 			$callback.="$('#pagination-{$id}').hide();$('#".$this->identifier."').trigger('searchTerminate',[$(self).val()]);";
-			$js->jsonArrayOn("change", "#".$this->_searchField->getDataField()->getIdentifier(),"#".$this->_identifier." tr.".$this->_modelClass, $this->_urls["refresh"],"post",["params"=>"{'s':$(self).val(),'_model':'".JString::doubleBackSlashes($this->_model)."'}","jsCallback"=>$callback]);
+			$js->jsonArrayOn("change", "#".$this->_searchField->getDataField()->getIdentifier(), "#".$this->_identifier." tr.".$this->_modelClass, $this->_urls["refresh"], "post", ["params"=>"{'s':$(self).val(),'_model':'".JString::doubleBackSlashes($this->_model)."'}", "jsCallback"=>$callback]);
 		}
 	}
 	
@@ -109,29 +109,29 @@ 
 	 * @param string $jsCallback
 	 * @return AjaxCall
 	 */
-	public function jsJsonArray($url, $method="get", $params="{}", $jsCallback=NULL,$parameters=[]){
-		$parameters=\array_merge($parameters,["modelSelector"=>"#".$this->_identifier." tr.".$this->_modelClass,"url"=>$url,"method"=>$method,"params"=>$params,"jsCallback"=>$jsCallback]);
+	public function jsJsonArray($url, $method="get", $params="{}", $jsCallback=NULL, $parameters=[]) {
+		$parameters=\array_merge($parameters, ["modelSelector"=>"#".$this->_identifier." tr.".$this->_modelClass, "url"=>$url, "method"=>$method, "params"=>$params, "jsCallback"=>$jsCallback]);
 		return new AjaxCall("jsonArray", $parameters);
 	}
 
-	public function jsClear(){
+	public function jsClear() {
 		return "$('#{$this->identifier} tbody').find('._json').remove();";
 	}
 
-	public function clearOn(BaseHtml $element,$event, $stopPropagation=false, $preventDefault=false){
-		return $element->addEvent($event, $this->jsClear(),$stopPropagation,$preventDefault);
+	public function clearOn(BaseHtml $element, $event, $stopPropagation=false, $preventDefault=false) {
+		return $element->addEvent($event, $this->jsClear(), $stopPropagation, $preventDefault);
 	}
 
-	public function clearOnClick(BaseHtml $element,$stopPropagation=false, $preventDefault=false){
-		return $this->clearOn($element, "click",$stopPropagation,$preventDefault);
+	public function clearOnClick(BaseHtml $element, $stopPropagation=false, $preventDefault=false) {
+		return $this->clearOn($element, "click", $stopPropagation, $preventDefault);
 	}
 
-	public function jsonArrayOn(BaseHtml $element,$event,$url, $method="get", $params="{}", $jsCallback=NULL,$parameters=[]){
-		return $element->_addEvent($event, $this->jsJsonArray($url,$method,$params,$jsCallback,$parameters));
+	public function jsonArrayOn(BaseHtml $element, $event, $url, $method="get", $params="{}", $jsCallback=NULL, $parameters=[]) {
+		return $element->_addEvent($event, $this->jsJsonArray($url, $method, $params, $jsCallback, $parameters));
 	}
 
-	public function jsonArrayOnClick(BaseHtml $element,$url, $method="get", $params="{}", $jsCallback=NULL,$parameters=[]){
-		return $this->jsonArrayOn($element, "click", $url,$method,$params,$jsCallback,$parameters);
+	public function jsonArrayOnClick(BaseHtml $element, $url, $method="get", $params="{}", $jsCallback=NULL, $parameters=[]) {
+		return $this->jsonArrayOn($element, "click", $url, $method, $params, $jsCallback, $parameters);
 	}
 
 	/**
@@ -142,8 +142,8 @@ 
 	 * @param number $pages_visibles The number of visible pages in the Pagination component
 	 * @return DataTable
 	 */
-	public function paginate($page,$total_rowcount,$items_per_page=10,$pages_visibles=null){
-		return parent::paginate($page, $total_rowcount,$items_per_page,$pages_visibles);
+	public function paginate($page, $total_rowcount, $items_per_page=10, $pages_visibles=null) {
+		return parent::paginate($page, $total_rowcount, $items_per_page, $pages_visibles);
 	}
 
 	public function setRowModelCallback($_rowModelCallback) {

Braces +3 added lines, -2 removed lines

@@ -59,8 +59,9 @@
 			$callback.=$js->trigger("#".$id." [name='selection[]']","change",false)."$('#".$id." tbody .ui.checkbox').checkbox();".$js->execOn("change", "#".$id." [name='selection[]']", $this->_getCheckedChange($js));
 			$callback.=$this->_generatePaginationScript($id);
 			if(isset($this->_urls["refresh"])){
-				if(isset($menu))
-				$js->jsonArrayOn("click", "#".$menu->getIdentifier()." a","#".$this->_identifier." tr.".$this->_modelClass, $this->_urls["refresh"],"post",["params"=>"{'p':$(this).attr('data-page'),'_model':'".JString::doubleBackSlashes($this->_model)."'}","jsCallback"=>$callback]);
+				if(isset($menu)) {
+								$js->jsonArrayOn("click", "#".$menu->getIdentifier()." a","#".$this->_identifier." tr.".$this->_modelClass, $this->_urls["refresh"],"post",["params"=>"{'p':$(this).attr('data-page'),'_model':'".JString::doubleBackSlashes($this->_model)."'}","jsCallback"=>$callback]);
+				}
 			}
 		}
 

Ajax/semantic/widgets/datatable/DataTable.php

Spacing +135 added lines, -135 removed lines

@@ -24,7 +24,7 @@ 
  *
  */
 class DataTable extends Widget {
-	use TableTrait,DataTableFieldAsTrait,HasCheckboxesTrait,BaseTrait;
+	use TableTrait, DataTableFieldAsTrait, HasCheckboxesTrait, BaseTrait;
 	protected $_searchField;
 	protected $_urls;
 	protected $_pagination;
@@ -43,41 +43,41 @@ 
 	protected $_colWidths;
 
 
-	public function __construct($identifier,$model,$modelInstance=NULL) {
-		parent::__construct($identifier, $model,$modelInstance);
-		$this->_init(new InstanceViewer($identifier), "table", new HtmlTable($identifier, 0,0), false);
+	public function __construct($identifier, $model, $modelInstance=NULL) {
+		parent::__construct($identifier, $model, $modelInstance);
+		$this->_init(new InstanceViewer($identifier), "table", new HtmlTable($identifier, 0, 0), false);
 		$this->_urls=[];
-		$this->_emptyMessage=new HtmlMessage("","nothing to display");
+		$this->_emptyMessage=new HtmlMessage("", "nothing to display");
 		$this->_emptyMessage->setIcon("info circle");
 	}
 
-	public function run(JsUtils $js){
+	public function run(JsUtils $js) {
 		$offset=$js->scriptCount();
-		if($this->_hasCheckboxes && isset($js)){
+		if ($this->_hasCheckboxes && isset($js)) {
 			$this->_runCheckboxes($js);
 		}
-		if($this->_visibleHover){
-			$js->execOn("mouseover", "#".$this->identifier." tr", "$(event.target).closest('tr').find('.visibleover').css('visibility', 'visible');",["preventDefault"=>false,"stopPropagation"=>true]);
-			$js->execOn("mouseout", "#".$this->identifier." tr", "$(event.target).closest('tr').find('.visibleover').css('visibility', 'hidden');",["preventDefault"=>false,"stopPropagation"=>true]);
+		if ($this->_visibleHover) {
+			$js->execOn("mouseover", "#".$this->identifier." tr", "$(event.target).closest('tr').find('.visibleover').css('visibility', 'visible');", ["preventDefault"=>false, "stopPropagation"=>true]);
+			$js->execOn("mouseout", "#".$this->identifier." tr", "$(event.target).closest('tr').find('.visibleover').css('visibility', 'hidden');", ["preventDefault"=>false, "stopPropagation"=>true]);
 		}
-		if(\is_array($this->_deleteBehavior))
-			$this->_generateBehavior("delete",$this->_deleteBehavior, $js);
-		if(\is_array($this->_editBehavior))
-			$this->_generateBehavior("edit",$this->_editBehavior,$js);
-		if(\is_array($this->_displayBehavior)){
-			$this->_generateBehavior("display",$this->_displayBehavior,$js);
+		if (\is_array($this->_deleteBehavior))
+			$this->_generateBehavior("delete", $this->_deleteBehavior, $js);
+		if (\is_array($this->_editBehavior))
+			$this->_generateBehavior("edit", $this->_editBehavior, $js);
+		if (\is_array($this->_displayBehavior)) {
+			$this->_generateBehavior("display", $this->_displayBehavior, $js);
 		}
 		parent::run($js);
-		if(isset($this->_pagination))
-			$this->_associatePaginationBehavior($js,$offset);
-		$this->_associateSearchFieldBehavior($js,$offset);
+		if (isset($this->_pagination))
+			$this->_associatePaginationBehavior($js, $offset);
+		$this->_associateSearchFieldBehavior($js, $offset);
 			
 	}
 
-	protected function _generateBehavior($op,$params,JsUtils $js){
-		if(isset($this->_urls[$op])){
-			$params=\array_merge($params,["attr"=>"data-ajax"]);
-			$js->ajaxOnClick("#".$this->identifier." ._".$op, $this->_urls[$op],$this->getTargetSelector($op),$params);
+	protected function _generateBehavior($op, $params, JsUtils $js) {
+		if (isset($this->_urls[$op])) {
+			$params=\array_merge($params, ["attr"=>"data-ajax"]);
+			$js->ajaxOnClick("#".$this->identifier." ._".$op, $this->_urls[$op], $this->getTargetSelector($op), $params);
 		}
 	}
 
@@ -90,21 +90,21 @@ 
 	}
 
 
-	public function compile(JsUtils $js=NULL,&$view=NULL){
-		if(!$this->_generated){
-			if(isset($this->_buttonsColumn)){
+	public function compile(JsUtils $js=NULL, &$view=NULL) {
+		if (!$this->_generated) {
+			if (isset($this->_buttonsColumn)) {
 				$this->_instanceViewer->sortColumnContent($this->_buttonsColumn, $this->_buttons);
 			}
 			$this->_instanceViewer->setInstance($this->_model);
 			$captions=$this->_instanceViewer->getCaptions();
 			$table=$this->content["table"];
-			if($this->_hasCheckboxes){
+			if ($this->_hasCheckboxes) {
 				$this->_generateMainCheckbox($captions);
 			}
 			$table->setRowCount(0, \sizeof($captions));
-			$this->_generateHeader($table,$captions);
+			$this->_generateHeader($table, $captions);
 
-			if(isset($this->_compileParts))
+			if (isset($this->_compileParts))
 				$table->setCompileParts($this->_compileParts);
 
 			$this->_generateContent($table);
@@ -112,147 +112,147 @@ 
 			$this->compileExtraElements($table, $captions);
 			$this->_compileSearchFieldBehavior($js);
 
-			$this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE,"table",PositionInTable::AFTERTABLE]);
+			$this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE, "table", PositionInTable::AFTERTABLE]);
 			$this->_compileForm();
 			$this->_applyStyleAttributes($table);
 			$this->_generated=true;
 		}
-		return parent::compile($js,$view);
+		return parent::compile($js, $view);
 	}
 
-	protected function compileExtraElements($table,$captions){
+	protected function compileExtraElements($table, $captions) {
 
-		if($this->_hasCheckboxes && $table->hasPart("thead")){
+		if ($this->_hasCheckboxes && $table->hasPart("thead")) {
 			$table->getHeader()->getCell(0, 0)->addClass("no-sort");
 		}
 
-		if(isset($this->_toolbar)){
+		if (isset($this->_toolbar)) {
 			$this->_setToolbarPosition($table, $captions);
 		}
-		if(isset($this->_pagination) && $this->_pagination->getVisible()){
+		if (isset($this->_pagination) && $this->_pagination->getVisible()) {
 			$this->_generatePagination($table);
 		}
 	}
 
-	protected function _applyStyleAttributes($table){
-		if(isset($this->_hiddenColumns))
+	protected function _applyStyleAttributes($table) {
+		if (isset($this->_hiddenColumns))
 			$this->_hideColumns();
-			if(isset($this->_colWidths)){
-				foreach ($this->_colWidths as $colIndex=>$width){
-					$table->setColWidth($colIndex,$width);
+			if (isset($this->_colWidths)) {
+				foreach ($this->_colWidths as $colIndex=>$width) {
+					$table->setColWidth($colIndex, $width);
 				}
 			}
 	}
 
-	protected function _hideColumns(){
-		foreach ($this->_hiddenColumns as $colIndex){
+	protected function _hideColumns() {
+		foreach ($this->_hiddenColumns as $colIndex) {
 			$this->_self->hideColumn($colIndex);
 		}
 		return $this;
 	}
 
-	protected function _generateHeader(HtmlTable $table,$captions){
+	protected function _generateHeader(HtmlTable $table, $captions) {
 		$table->setHeaderValues($captions);
-		if(isset($this->_sortable)){
+		if (isset($this->_sortable)) {
 			$table->setSortable($this->_sortable);
 		}
 	}
 
 
 
-	protected function _generateContent($table){
+	protected function _generateContent($table) {
 		$objects=$this->_modelInstance;
-		if(isset($this->_pagination)){
+		if (isset($this->_pagination)) {
 			$objects=$this->_pagination->getObjects($this->_modelInstance);
 		}
 			InstanceViewer::setIndex(0);
 			$fields=$this->_instanceViewer->getSimpleProperties();
-			if(!is_array($this->_instanceViewer->getGroupByFields())){
-				$table->fromDatabaseObjects($objects, function($instance) use($table,$fields){
-					return $this->_generateRow($instance, $fields,$table);
+			if (!is_array($this->_instanceViewer->getGroupByFields())) {
+				$table->fromDatabaseObjects($objects, function($instance) use($table, $fields){
+					return $this->_generateRow($instance, $fields, $table);
 				});
-			}else{
+			} else {
 				$groupByFields=$this->_instanceViewer->getGroupByFields();
 				$activeValues=array_combine($groupByFields, array_fill(0, sizeof($groupByFields), null));
 				$uuids=[];
-				$table->fromDatabaseObjects($objects, function($instance) use($table,$fields,&$activeValues,$groupByFields,&$uuids){
+				$table->fromDatabaseObjects($objects, function($instance) use($table, $fields, &$activeValues, $groupByFields, &$uuids){
 					$this->_instanceViewer->setInstance($instance);
-					foreach ($groupByFields as $index=>$gbField){
-						$this->_generateGroupByRow($index, $gbField, $table,$fields,$activeValues, $uuids);
+					foreach ($groupByFields as $index=>$gbField) {
+						$this->_generateGroupByRow($index, $gbField, $table, $fields, $activeValues, $uuids);
 					}
-					return $this->_generateRow($instance, $fields,$table,null,$uuids);
+					return $this->_generateRow($instance, $fields, $table, null, $uuids);
 				});
 			}
-		if($table->getRowCount()==0){
+		if ($table->getRowCount()==0) {
 			$result=$table->addRow();
 			$result->mergeRow();
 			$result->setValues([$this->_emptyMessage]);
 		}
 	}
 	
-	protected function _generateGroupByRow($index,$gbField,$table,$fields,&$activeValues,&$uuids){
+	protected function _generateGroupByRow($index, $gbField, $table, $fields, &$activeValues, &$uuids) {
 		$newValue=$this->_instanceViewer->getValue($gbField);
-		if($this->getElementContent($activeValues[$gbField])!==$this->getElementContent($newValue)){
-			if($index==0){
+		if ($this->getElementContent($activeValues[$gbField])!==$this->getElementContent($newValue)) {
+			if ($index==0) {
 				$uuids=[];
 			}
 			$uuid=uniqid("grp");
 			$uuids[$gbField]=$uuid;
 			$id=$this->_instanceViewer->getIdentifier();
-			$result=$table->addMergeRow(sizeof($fields)+1,$newValue);
+			$result=$table->addMergeRow(sizeof($fields)+1, $newValue);
 			$result->setIdentifier($this->identifier."-tr-gb-".$id);
-			$result->setProperty("data-ajax",$id);
-			$result->setProperty("data-group",$uuid);
-			$result->addToProperty("class",$this->_rowClass);
+			$result->setProperty("data-ajax", $id);
+			$result->setProperty("data-group", $uuid);
+			$result->addToProperty("class", $this->_rowClass);
 			$activeValues[$gbField]=$newValue;
 		}
 	}
 	
-	private function getElementContent($elm){
-		if($elm instanceof HtmlDoubleElement){
+	private function getElementContent($elm) {
+		if ($elm instanceof HtmlDoubleElement) {
 			return $elm->getTextContent();
 		}
 		return $elm;
 	}
 
-	protected function _generateRow($instance,$fields,&$table,$checkedClass=null,$uuids=null){
+	protected function _generateRow($instance, $fields, &$table, $checkedClass=null, $uuids=null) {
 		$this->_instanceViewer->setInstance($instance);
 		InstanceViewer::$index++;
-		$values= $this->_instanceViewer->getValues();
+		$values=$this->_instanceViewer->getValues();
 		$id=$this->_instanceViewer->getIdentifier();
 		$dataAjax=$id;
 		$id=$this->cleanIdentifier($id);
-		if($this->_hasCheckboxes){
-			$ck=new HtmlCheckbox("ck-".$this->identifier."-".$id,"");
+		if ($this->_hasCheckboxes) {
+			$ck=new HtmlCheckbox("ck-".$this->identifier."-".$id, "");
 			$checked=false;
-			if(isset($this->_checkedCallback)){
+			if (isset($this->_checkedCallback)) {
 				$func=$this->_checkedCallback;
 				$checked=$func($instance);
 			}
 			$ck->setChecked($checked);
 			$ck->setOnChange("event.stopPropagation();");
 			$field=$ck->getField();
-			$field->setProperty("value",$dataAjax);
+			$field->setProperty("value", $dataAjax);
 			$field->setProperty("name", "selection[]");
-			if(isset($checkedClass))
+			if (isset($checkedClass))
 				$field->setClass($checkedClass);
 			\array_unshift($values, $ck);
 		}
 		$result=$table->newRow();
 		$result->setIdentifier($this->identifier."-tr-".$id);
-		$result->setProperty("data-ajax",$dataAjax);
+		$result->setProperty("data-ajax", $dataAjax);
 		$result->setValues($values);
-		$result->addToProperty("class",$this->_rowClass);
+		$result->addToProperty("class", $this->_rowClass);
 		$result->setPropertyValues("data-field", $fields);
-		if(isset($uuids)){
-			$result->setProperty("data-child",implode(" ", $uuids));
+		if (isset($uuids)) {
+			$result->setProperty("data-child", implode(" ", $uuids));
 		}
 		return $result;
 	}
 
-	protected function _generatePagination($table){
-		if(isset($this->_toolbar)){
-			if($this->_toolbarPosition==PositionInTable::FOOTER)
+	protected function _generatePagination($table) {
+		if (isset($this->_toolbar)) {
+			if ($this->_toolbarPosition==PositionInTable::FOOTER)
 				$this->_toolbar->setFloated("left");
 		}
 		$footer=$table->getFooter();
@@ -260,44 +260,44 @@ 
 		$footer->addValues($this->_pagination->generateMenu($this->identifier));
 	}
 
-	protected function _associatePaginationBehavior(JsUtils $js=NULL,$offset=null){
-		if(isset($this->_urls["refresh"])){
-			$this->_pagination->getMenu()->postOnClick($this->_urls["refresh"],"{'p':$(this).attr('data-page'),'_model':'".JString::doubleBackSlashes($this->_model)."'}",$this->getRefreshSelector(),["preventDefault"=>false,"jqueryDone"=>"replaceWith","hasLoader"=>false,"jsCallback"=>'$("#'.$this->identifier.'").trigger("pageChange");$("#'.$this->identifier.'").trigger("activeRowChange");']);
+	protected function _associatePaginationBehavior(JsUtils $js=NULL, $offset=null) {
+		if (isset($this->_urls["refresh"])) {
+			$this->_pagination->getMenu()->postOnClick($this->_urls["refresh"], "{'p':$(this).attr('data-page'),'_model':'".JString::doubleBackSlashes($this->_model)."'}", $this->getRefreshSelector(), ["preventDefault"=>false, "jqueryDone"=>"replaceWith", "hasLoader"=>false, "jsCallback"=>'$("#'.$this->identifier.'").trigger("pageChange");$("#'.$this->identifier.'").trigger("activeRowChange");']);
 		}
 	}
 	
-	protected function _compileSearchFieldBehavior(JsUtils $js=NULL){
-		if(isset($this->_searchField) && isset($js) && isset($this->_urls["refresh"])){
-			$this->_searchField->postOn("change", $this->_urls["refresh"],"{'s':$(self).val(),'_model':'".JString::doubleBackSlashes($this->_model)."'}","#".$this->identifier." tbody",["preventDefault"=>false,"jqueryDone"=>"replaceWith","hasLoader"=>"internal","jsCallback"=>'$("#'.$this->identifier.'").trigger("searchTerminate",[$(self).val()]);']);
+	protected function _compileSearchFieldBehavior(JsUtils $js=NULL) {
+		if (isset($this->_searchField) && isset($js) && isset($this->_urls["refresh"])) {
+			$this->_searchField->postOn("change", $this->_urls["refresh"], "{'s':$(self).val(),'_model':'".JString::doubleBackSlashes($this->_model)."'}", "#".$this->identifier." tbody", ["preventDefault"=>false, "jqueryDone"=>"replaceWith", "hasLoader"=>"internal", "jsCallback"=>'$("#'.$this->identifier.'").trigger("searchTerminate",[$(self).val()]);']);
 		}
 	}
-	protected function _associateSearchFieldBehavior(JsUtils $js=NULL,$offset=null){
+	protected function _associateSearchFieldBehavior(JsUtils $js=NULL, $offset=null) {
 		
 	}
 
-	protected function _getFieldName($index){
+	protected function _getFieldName($index) {
 		$fieldName=parent::_getFieldName($index);
-		if(\is_object($fieldName))
+		if (\is_object($fieldName))
 			$fieldName="field-".$index;
 		return $fieldName."[]";
 	}
 
-	protected function _getFieldCaption($index){
+	protected function _getFieldCaption($index) {
 		return null;
 	}
 
-	protected function _setToolbarPosition($table,$captions=NULL){
-		switch ($this->_toolbarPosition){
+	protected function _setToolbarPosition($table, $captions=NULL) {
+		switch ($this->_toolbarPosition) {
 			case PositionInTable::BEFORETABLE:
 			case PositionInTable::AFTERTABLE:
-				if(isset($this->_compileParts)===false){
+				if (isset($this->_compileParts)===false) {
 					$this->content[$this->_toolbarPosition]=$this->_toolbar;
 				}
 				break;
 			case PositionInTable::HEADER:
 			case PositionInTable::FOOTER:
 			case PositionInTable::BODY:
-				$this->addToolbarRow($this->_toolbarPosition,$table, $captions);
+				$this->addToolbarRow($this->_toolbarPosition, $table, $captions);
 				break;
 		}
 	}
@@ -309,16 +309,16 @@ 
 	 * @param callable $callback function called after the field compilation
 	 * @return DataTable
 	 */
-	public function afterCompile($index,$callback){
-		$this->_instanceViewer->afterCompile($index,$callback);
+	public function afterCompile($index, $callback) {
+		$this->_instanceViewer->afterCompile($index, $callback);
 		return $this;
 	}
 
-	private function addToolbarRow($part,$table,$captions){
+	private function addToolbarRow($part, $table, $captions) {
 		$hasPart=$table->hasPart($part);
-		if($hasPart){
+		if ($hasPart) {
 			$row=$table->getPart($part)->addRow(\sizeof($captions));
-		}else{
+		} else {
 			$row=$table->getPart($part)->getRow(0);
 		}
 		$row->mergeCol();
@@ -330,7 +330,7 @@ 
 	 * @see Widget::getHtmlComponent()
 	 * @return HtmlTable
 	 */
-	public function getHtmlComponent(){
+	public function getHtmlComponent() {
 		return $this->content["table"];
 	}
 
@@ -345,13 +345,13 @@ 
 	 * @return DataTable
 	 */
 	public function setUrls($urls) {
-		if(\is_array($urls)){
-			$this->_urls["refresh"]=JArray::getValue($urls, "refresh",0);
-			$this->_urls["edit"]=JArray::getValue($urls, "edit",1);
-			$this->_urls["delete"]=JArray::getValue($urls, "delete",2);
-			$this->_urls["display"]=JArray::getValue($urls, "display",3);
-		}else{
-			$this->_urls=["refresh"=>$urls,"edit"=>$urls,"delete"=>$urls,"display"=>$urls];
+		if (\is_array($urls)) {
+			$this->_urls["refresh"]=JArray::getValue($urls, "refresh", 0);
+			$this->_urls["edit"]=JArray::getValue($urls, "edit", 1);
+			$this->_urls["delete"]=JArray::getValue($urls, "delete", 2);
+			$this->_urls["display"]=JArray::getValue($urls, "display", 3);
+		} else {
+			$this->_urls=["refresh"=>$urls, "edit"=>$urls, "delete"=>$urls, "display"=>$urls];
 		}
 		return $this;
 	}
@@ -364,8 +364,8 @@ 
 	 * @param number $pages_visibles The number of visible pages in the Pagination component
 	 * @return DataTable
 	 */
-	public function paginate($page,$total_rowcount,$items_per_page=10,$pages_visibles=null){
-		$this->_pagination=new Pagination($items_per_page,$pages_visibles,$page,$total_rowcount);
+	public function paginate($page, $total_rowcount, $items_per_page=10, $pages_visibles=null) {
+		$this->_pagination=new Pagination($items_per_page, $pages_visibles, $page, $total_rowcount);
 		return $this;
 	}
 
@@ -376,8 +376,8 @@ 
 	 * @param number $pages_visibles The number of visible pages in the Pagination component
 	 * @return DataTable
 	 */
-	public function autoPaginate($page=1,$items_per_page=10,$pages_visibles=4){
-		$this->_pagination=new Pagination($items_per_page,$pages_visibles,$page);
+	public function autoPaginate($page=1, $items_per_page=10, $pages_visibles=4) {
+		$this->_pagination=new Pagination($items_per_page, $pages_visibles, $page);
 		return $this;
 	}
 
@@ -387,7 +387,7 @@ 
 	 * @param array $compileParts
 	 * @return DataTable
 	 */
-	public function refresh($compileParts=["tbody"]){
+	public function refresh($compileParts=["tbody"]) {
 		$this->_compileParts=$compileParts;
 		return $this;
 	}
@@ -398,14 +398,14 @@ 
 	 * @param string $position
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
-	public function addSearchInToolbar($position=Direction::RIGHT){
+	public function addSearchInToolbar($position=Direction::RIGHT) {
 		return $this->addInToolbar($this->getSearchField())->setPosition($position);
 	}
 
-	public function getSearchField(){
-		if(isset($this->_searchField)===false){
-			$this->_searchField=new HtmlInput("search-".$this->identifier,"search","","Search...");
-			$this->_searchField->addIcon("search",Direction::RIGHT);
+	public function getSearchField() {
+		if (isset($this->_searchField)===false) {
+			$this->_searchField=new HtmlInput("search-".$this->identifier, "search", "", "Search...");
+			$this->_searchField->addIcon("search", Direction::RIGHT);
 		}
 		return $this->_searchField;
 	}
@@ -425,7 +425,7 @@ 
 	 * Returns a form corresponding to the Datatable
 	 * @return \Ajax\semantic\html\collections\form\HtmlForm
 	 */
-	public function asForm(){
+	public function asForm() {
 		return $this->getForm();
 	}
 
@@ -433,7 +433,7 @@ 
 
 	protected function getTargetSelector($op) {
 		$result=$this->_targetSelector;
-		if(!isset($result[$op]))
+		if (!isset($result[$op]))
 			$result="#".$this->identifier;
 		return $result[$op];
 	}
@@ -444,15 +444,15 @@ 
 	 * @return DataTable
 	 */
 	public function setTargetSelector($_targetSelector) {
-		if(!\is_array($_targetSelector)){
-			$_targetSelector=["edit"=>$_targetSelector,"delete"=>$_targetSelector];
+		if (!\is_array($_targetSelector)) {
+			$_targetSelector=["edit"=>$_targetSelector, "delete"=>$_targetSelector];
 		}
 		$this->_targetSelector=$_targetSelector;
 		return $this;
 	}
 
 	public function getRefreshSelector() {
-		if(isset($this->_refreshSelector))
+		if (isset($this->_refreshSelector))
 			return $this->_refreshSelector;
 		return "#".$this->identifier." tbody";
 	}
@@ -470,9 +470,9 @@ 
 	 * {@inheritDoc}
 	 * @see \Ajax\common\Widget::show()
 	 */
-	public function show($modelInstance){
-		if(\is_array($modelInstance)){
-			if(isset($modelInstance[0]) && \is_array(array_values($modelInstance)[0]))
+	public function show($modelInstance) {
+		if (\is_array($modelInstance)) {
+			if (isset($modelInstance[0]) && \is_array(array_values($modelInstance)[0]))
 				$modelInstance=\json_decode(\json_encode($modelInstance), FALSE);
 		}
 		$this->_modelInstance=$modelInstance;
@@ -507,37 +507,37 @@ 
 		return $this;
 	}
 
-	public function setActiveRowSelector($class="active",$event="click",$multiple=false){
-		$this->_self->setActiveRowSelector($class,$event,$multiple);
+	public function setActiveRowSelector($class="active", $event="click", $multiple=false) {
+		$this->_self->setActiveRowSelector($class, $event, $multiple);
 		return $this;
 	}
 
-	public function hideColumn($colIndex){
-		if(!\is_array($this->_hiddenColumns))
+	public function hideColumn($colIndex) {
+		if (!\is_array($this->_hiddenColumns))
 			$this->_hiddenColumns=[];
 		$this->_hiddenColumns[]=$colIndex;
 		return $this;
 	}
 
-	public function setColWidth($colIndex,$width){
+	public function setColWidth($colIndex, $width) {
 		$this->_colWidths[$colIndex]=$width;
 		return $this;
 	}
 	public function setColWidths($_colWidths) {
-		$this->_colWidths = $_colWidths;
+		$this->_colWidths=$_colWidths;
 		return $this;
 	}
 
-	public function setColAlignment($colIndex,$alignment){
-		$this->content["table"]->setColAlignment($colIndex,$alignment);
+	public function setColAlignment($colIndex, $alignment) {
+		$this->content["table"]->setColAlignment($colIndex, $alignment);
 		return $this;
 	}
 	
-	public function trigger($event,$params="[]"){
-		return $this->getHtmlComponent()->trigger($event,$params);
+	public function trigger($event, $params="[]") {
+		return $this->getHtmlComponent()->trigger($event, $params);
 	}
 	
-	public function onActiveRowChange($jsCode){
+	public function onActiveRowChange($jsCode) {
 		$this->getHtmlComponent()->onActiveRowChange($jsCode);
 		return $this;
 	}
@@ -565,7 +565,7 @@ 
 	 * @param mixed $_displayBehavior
 	 */
 	public function setDisplayBehavior($_displayBehavior) {
-		$this->_displayBehavior = $_displayBehavior;
+		$this->_displayBehavior=$_displayBehavior;
 	}
 	/**
 	 * @return mixed

Braces +39 added lines, -27 removed lines

@@ -60,16 +60,19 @@ 
 			$js->execOn("mouseover", "#".$this->identifier." tr", "$(event.target).closest('tr').find('.visibleover').css('visibility', 'visible');",["preventDefault"=>false,"stopPropagation"=>true]);
 			$js->execOn("mouseout", "#".$this->identifier." tr", "$(event.target).closest('tr').find('.visibleover').css('visibility', 'hidden');",["preventDefault"=>false,"stopPropagation"=>true]);
 		}
-		if(\is_array($this->_deleteBehavior))
-			$this->_generateBehavior("delete",$this->_deleteBehavior, $js);
-		if(\is_array($this->_editBehavior))
-			$this->_generateBehavior("edit",$this->_editBehavior,$js);
+		if(\is_array($this->_deleteBehavior)) {
+					$this->_generateBehavior("delete",$this->_deleteBehavior, $js);
+		}
+		if(\is_array($this->_editBehavior)) {
+					$this->_generateBehavior("edit",$this->_editBehavior,$js);
+		}
 		if(\is_array($this->_displayBehavior)){
 			$this->_generateBehavior("display",$this->_displayBehavior,$js);
 		}
 		parent::run($js);
-		if(isset($this->_pagination))
-			$this->_associatePaginationBehavior($js,$offset);
+		if(isset($this->_pagination)) {
+					$this->_associatePaginationBehavior($js,$offset);
+		}
 		$this->_associateSearchFieldBehavior($js,$offset);
 			
 	}
@@ -104,8 +107,9 @@ 
 			$table->setRowCount(0, \sizeof($captions));
 			$this->_generateHeader($table,$captions);
 
-			if(isset($this->_compileParts))
-				$table->setCompileParts($this->_compileParts);
+			if(isset($this->_compileParts)) {
+							$table->setCompileParts($this->_compileParts);
+			}
 
 			$this->_generateContent($table);
 
@@ -135,8 +139,9 @@ 
 	}
 
 	protected function _applyStyleAttributes($table){
-		if(isset($this->_hiddenColumns))
-			$this->_hideColumns();
+		if(isset($this->_hiddenColumns)) {
+					$this->_hideColumns();
+		}
 			if(isset($this->_colWidths)){
 				foreach ($this->_colWidths as $colIndex=>$width){
 					$table->setColWidth($colIndex,$width);
@@ -171,7 +176,7 @@ 
 				$table->fromDatabaseObjects($objects, function($instance) use($table,$fields){
 					return $this->_generateRow($instance, $fields,$table);
 				});
-			}else{
+			} else{
 				$groupByFields=$this->_instanceViewer->getGroupByFields();
 				$activeValues=array_combine($groupByFields, array_fill(0, sizeof($groupByFields), null));
 				$uuids=[];
@@ -234,8 +239,9 @@ 
 			$field=$ck->getField();
 			$field->setProperty("value",$dataAjax);
 			$field->setProperty("name", "selection[]");
-			if(isset($checkedClass))
-				$field->setClass($checkedClass);
+			if(isset($checkedClass)) {
+							$field->setClass($checkedClass);
+			}
 			\array_unshift($values, $ck);
 		}
 		$result=$table->newRow();
@@ -252,8 +258,9 @@ 
 
 	protected function _generatePagination($table){
 		if(isset($this->_toolbar)){
-			if($this->_toolbarPosition==PositionInTable::FOOTER)
-				$this->_toolbar->setFloated("left");
+			if($this->_toolbarPosition==PositionInTable::FOOTER) {
+							$this->_toolbar->setFloated("left");
+			}
 		}
 		$footer=$table->getFooter();
 		$footer->mergeCol();
@@ -277,8 +284,9 @@ 
 
 	protected function _getFieldName($index){
 		$fieldName=parent::_getFieldName($index);
-		if(\is_object($fieldName))
-			$fieldName="field-".$index;
+		if(\is_object($fieldName)) {
+					$fieldName="field-".$index;
+		}
 		return $fieldName."[]";
 	}
 
@@ -318,7 +326,7 @@ 
 		$hasPart=$table->hasPart($part);
 		if($hasPart){
 			$row=$table->getPart($part)->addRow(\sizeof($captions));
-		}else{
+		} else{
 			$row=$table->getPart($part)->getRow(0);
 		}
 		$row->mergeCol();
@@ -350,7 +358,7 @@ 
 			$this->_urls["edit"]=JArray::getValue($urls, "edit",1);
 			$this->_urls["delete"]=JArray::getValue($urls, "delete",2);
 			$this->_urls["display"]=JArray::getValue($urls, "display",3);
-		}else{
+		} else{
 			$this->_urls=["refresh"=>$urls,"edit"=>$urls,"delete"=>$urls,"display"=>$urls];
 		}
 		return $this;
@@ -433,8 +441,9 @@ 
 
 	protected function getTargetSelector($op) {
 		$result=$this->_targetSelector;
-		if(!isset($result[$op]))
-			$result="#".$this->identifier;
+		if(!isset($result[$op])) {
+					$result="#".$this->identifier;
+		}
 		return $result[$op];
 	}
 
@@ -452,8 +461,9 @@ 
 	}
 
 	public function getRefreshSelector() {
-		if(isset($this->_refreshSelector))
-			return $this->_refreshSelector;
+		if(isset($this->_refreshSelector)) {
+					return $this->_refreshSelector;
+		}
 		return "#".$this->identifier." tbody";
 	}
 
@@ -472,8 +482,9 @@ 
 	 */
 	public function show($modelInstance){
 		if(\is_array($modelInstance)){
-			if(isset($modelInstance[0]) && \is_array(array_values($modelInstance)[0]))
-				$modelInstance=\json_decode(\json_encode($modelInstance), FALSE);
+			if(isset($modelInstance[0]) && \is_array(array_values($modelInstance)[0])) {
+							$modelInstance=\json_decode(\json_encode($modelInstance), FALSE);
+			}
 		}
 		$this->_modelInstance=$modelInstance;
 	}
@@ -513,8 +524,9 @@ 
 	}
 
 	public function hideColumn($colIndex){
-		if(!\is_array($this->_hiddenColumns))
-			$this->_hiddenColumns=[];
+		if(!\is_array($this->_hiddenColumns)) {
+					$this->_hiddenColumns=[];
+		}
 		$this->_hiddenColumns[]=$colIndex;
 		return $this;
 	}

Ajax/semantic/widgets/base/InstanceViewer.php

Spacing +117 added lines, -117 removed lines

@@ -20,50 +20,50 @@ 
 
 	public static $index=0;
 
-	public function __construct($identifier,$instance=NULL,$captions=NULL){
+	public function __construct($identifier, $instance=NULL, $captions=NULL) {
 		$this->widgetIdentifier=$identifier;
 		$this->values=[];
 		$this->afterCompile=[];
-		if(isset($instance))
+		if (isset($instance))
 			$this->setInstance($instance);
 		$this->setCaptions($captions);
 		$this->captionCallback=NULL;
-		$this->defaultValueFunction=function($name,$value){return $value;};
+		$this->defaultValueFunction=function($name, $value) {return $value; };
 	}
 
-	public function moveFieldTo($from,$to){
-		if(JArray::moveElementTo($this->visibleProperties, $from, $to)){
+	public function moveFieldTo($from, $to) {
+		if (JArray::moveElementTo($this->visibleProperties, $from, $to)) {
 			return JArray::moveElementTo($this->values, $from, $to);
 		}
 		return false;
 	}
 
-	public function swapFields($index1,$index2){
-		if(JArray::swapElements($this->visibleProperties, $index1, $index2)){
+	public function swapFields($index1, $index2) {
+		if (JArray::swapElements($this->visibleProperties, $index1, $index2)) {
 			return JArray::swapElements($this->values, $index1, $index2);
 		}
 		return false;
 	}
 
-	public function removeField($index){
-		\array_splice($this->visibleProperties,$index,1);
-		\array_splice($this->values,$index,1);
-		\array_splice($this->captions,$index,1);
+	public function removeField($index) {
+		\array_splice($this->visibleProperties, $index, 1);
+		\array_splice($this->values, $index, 1);
+		\array_splice($this->captions, $index, 1);
 		return $this;
 	}
 
-	public function getValues(){
+	public function getValues() {
 		$values=[];
 		$index=0;
 		$count=$this->count();
 		$hasGroupby=is_array($this->groupByFields);
-		if(!$hasGroupby){
-			while($index<$count){
+		if (!$hasGroupby) {
+			while ($index<$count) {
 					$values[]=$this->getValue($index++);
 			}
-		}else{
-			while($index<$count){
-				if(array_search($index, $this->groupByFields)===false){
+		} else {
+			while ($index<$count) {
+				if (array_search($index, $this->groupByFields)===false) {
 					$values[]=$this->getValue($index);
 				}
 				$index++;
@@ -72,203 +72,203 @@ 
 		return $values;
 	}
 
-	public function getIdentifier($index=NULL){
-		if(!isset($index))
+	public function getIdentifier($index=NULL) {
+		if (!isset($index))
 			$index=self::$index;
 		$value=$index;
-		if(isset($this->values["identifier"])){
-			if(\is_string($this->values["identifier"]))
+		if (isset($this->values["identifier"])) {
+			if (\is_string($this->values["identifier"]))
 				$value=JReflection::callMethod($this->instance, $this->values["identifier"], []);
 			else
-				$value=$this->values["identifier"]($index,$this->instance);
+				$value=$this->values["identifier"]($index, $this->instance);
 		}
 		return $value;
 	}
 
-	public function getValue($index){
+	public function getValue($index) {
 		$property=$this->properties[$index];
 		return $this->_getValue($property, $index);
 	}
 
-	protected function _beforeAddProperty($index,&$field){
+	protected function _beforeAddProperty($index, &$field) {
 
 	}
 
-	protected function _getDefaultValue($name,$value,$index){
+	protected function _getDefaultValue($name, $value, $index) {
 		$func=$this->defaultValueFunction;
-		return $func($name,$value,$index,$this->instance);
+		return $func($name, $value, $index, $this->instance);
 	}
 
-	protected function _getPropertyValue(\ReflectionProperty $property){
+	protected function _getPropertyValue(\ReflectionProperty $property) {
 		$property->setAccessible(true);
 		return $property->getValue($this->instance);
 	}
 
-	protected function _getValue($property,$index){
+	protected function _getValue($property, $index) {
 		$value=null;
 		$propertyName=$property;
-		if($property instanceof \ReflectionProperty){
+		if ($property instanceof \ReflectionProperty) {
 			$value=$this->_getPropertyValue($property);
 			$propertyName=$property->getName();
-		}elseif(\is_callable($property) && array_search($property, ["system"])===false)
+		}elseif (\is_callable($property) && array_search($property, ["system"])===false)
 			$value=$property($this->instance);
-		elseif(\is_array($property)){
-			$values=\array_map(function($v) use ($index){return $this->_getValue($v, $index);}, $property);
+		elseif (\is_array($property)) {
+			$values=\array_map(function($v) use ($index){return $this->_getValue($v, $index); }, $property);
 			$value=\implode("", $values);
-		}elseif(\is_string($property)){
+		}elseif (\is_string($property)) {
 			$value=$property;
-			if(isset($this->instance->{$property})){
+			if (isset($this->instance->{$property})) {
 				$value=$this->instance->{$property};
-			}elseif(\method_exists($this->instance, $getter=JReflection::getterName($property))){
+			}elseif (\method_exists($this->instance, $getter=JReflection::getterName($property))) {
 				$value=JReflection::callMethod($this->instance, $getter, []);
 			}
 		}
 		return $this->_postGetValue($index, $propertyName, $value);
 	}
 
-	protected function _postGetValue($index,$propertyName,$value){
-		if(isset($this->values[$index])){
-			$value= $this->values[$index]($value,$this->instance,$index,self::$index);
-		}else{
-			$value=$this->_getDefaultValue($propertyName,$value, $index);
+	protected function _postGetValue($index, $propertyName, $value) {
+		if (isset($this->values[$index])) {
+			$value=$this->values[$index]($value, $this->instance, $index, self::$index);
+		} else {
+			$value=$this->_getDefaultValue($propertyName, $value, $index);
 		}
-		if(isset($this->afterCompile[$index])){
-			if(\is_callable($this->afterCompile[$index])){
-				$this->afterCompile[$index]($value,$this->instance,self::$index);
+		if (isset($this->afterCompile[$index])) {
+			if (\is_callable($this->afterCompile[$index])) {
+				$this->afterCompile[$index]($value, $this->instance, self::$index);
 			}
 		}
 		return $value;
 	}
 
-	public function insertField($index,$field,$key=null){
-		if(isset($key)){
-			array_splice( $this->visibleProperties, $index, 0, [$key=>$field] );
-		}else{
-			array_splice( $this->visibleProperties, $index, 0, $field );
+	public function insertField($index, $field, $key=null) {
+		if (isset($key)) {
+			array_splice($this->visibleProperties, $index, 0, [$key=>$field]);
+		} else {
+			array_splice($this->visibleProperties, $index, 0, $field);
 		}
 		return $this;
 	}
 	
-	public function sortColumnContent($index,$array){
-		if(isset($this->visibleProperties[$index])){
-			if(is_array($this->visibleProperties[$index])){
-				$this->visibleProperties[$index]=JArray::sortAssociative($this->visibleProperties[$index],$array);
+	public function sortColumnContent($index, $array) {
+		if (isset($this->visibleProperties[$index])) {
+			if (is_array($this->visibleProperties[$index])) {
+				$this->visibleProperties[$index]=JArray::sortAssociative($this->visibleProperties[$index], $array);
 			}
 		}
 		return $this;
 	}
 
-	public function insertInField($index,$field,$key=null){
+	public function insertInField($index, $field, $key=null) {
 		$vb=$this->visibleProperties;
-		if(isset($vb[$index])){
-			if(isset($key)){
-				if(\is_array($vb[$index])){
+		if (isset($vb[$index])) {
+			if (isset($key)) {
+				if (\is_array($vb[$index])) {
 					$this->visibleProperties[$index][$key]=$field;
-				}else{
-					$this->visibleProperties[$index]=[$vb[$index],$key=>$field];
+				} else {
+					$this->visibleProperties[$index]=[$vb[$index], $key=>$field];
 				}
-			}else{
-				if(\is_array($vb[$index])){
+			} else {
+				if (\is_array($vb[$index])) {
 					$this->visibleProperties[$index][]=$field;
-				}else{
-					$this->visibleProperties[$index]=[$vb[$index],$field];
+				} else {
+					$this->visibleProperties[$index]=[$vb[$index], $field];
 				}
 			}
-		}else{
+		} else {
 			return $this->insertField($index, $field);
 		}
 		return $this;
 	}
 
-	public function addField($field,$key=null){
-		if(isset($key)){
+	public function addField($field, $key=null) {
+		if (isset($key)) {
 			$this->visibleProperties[]=[$key=>$field];
-		}else{
+		} else {
 			$this->visibleProperties[]=$field;
 		}
 		return $this;
 	}
 
-	public function addFields($fields){
-		$this->visibleProperties=\array_merge($this->visibleProperties,$fields);
+	public function addFields($fields) {
+		$this->visibleProperties=\array_merge($this->visibleProperties, $fields);
 		return $this;
 	}
 
-	public function count(){
+	public function count() {
 		return \sizeof($this->properties);
 	}
 
-	public function visiblePropertiesCount(){
+	public function visiblePropertiesCount() {
 		return \sizeof($this->visibleProperties);
 	}
 
-	public function getProperty($index){
+	public function getProperty($index) {
 		return $this->properties[$index];
 	}
 
-	public function getFieldName($index){
+	public function getFieldName($index) {
 		$property=$this->getProperty($index);
-		if($property instanceof \ReflectionProperty){
+		if ($property instanceof \ReflectionProperty) {
 			$result=$property->getName();
-		}elseif(\is_callable($property)){
+		}elseif (\is_callable($property)) {
 			$result=$this->visibleProperties[$index];
-		}else{
+		} else {
 			$result=$property;
 		}
 		return $result;
 	}
 
 
-	protected function showableProperty(\ReflectionProperty $rProperty){
-		return JString::startswith($rProperty->getName(),"_")===false;
+	protected function showableProperty(\ReflectionProperty $rProperty) {
+		return JString::startswith($rProperty->getName(), "_")===false;
 	}
 
 	public function setInstance($instance) {
-		if(\is_string($instance)){
+		if (\is_string($instance)) {
 			$instance=new $instance();
 		}
 		$this->instance=$instance;
 		$this->properties=[];
 		$this->reflect=new \ReflectionClass($instance);
-		if(JArray::count($this->visibleProperties)===0){
+		if (JArray::count($this->visibleProperties)===0) {
 			$this->properties=$this->getDefaultProperties();
-		}else{
-			foreach ($this->visibleProperties as $property){
+		} else {
+			foreach ($this->visibleProperties as $property) {
 				$this->setInstanceProperty($property);
 			}
 		}
 		return $this;
 	}
 
-	private function setInstanceProperty($property){
-		if(\is_callable($property)){
+	private function setInstanceProperty($property) {
+		if (\is_callable($property)) {
 			$this->properties[]=$property;
-		}elseif(\is_string($property)){
-			try{
+		}elseif (\is_string($property)) {
+			try {
 				$this->_beforeAddProperty(\sizeof($this->properties), $property);
 				$rProperty=$this->reflect->getProperty($property);
 				$this->properties[]=$rProperty;
-			}catch(\Exception $e){
+			}catch (\Exception $e) {
 				$this->_beforeAddProperty(\sizeof($this->properties), $property);
 				$this->properties[]=$property;
 			}
-		}elseif(\is_int($property)){
+		}elseif (\is_int($property)) {
 			$props=$this->getDefaultProperties();
-			if(isset($props[$property]))
+			if (isset($props[$property]))
 				$this->properties[]=$props[$property];
 				else
 					$this->properties[]=$property;
-		}else{
+		} else {
 			$this->properties[]=$property;
 		}
 	}
 
-	protected function getDefaultProperties(){
+	protected function getDefaultProperties() {
 		$result=[];
 		$properties=$this->reflect->getProperties();
-		foreach ($properties as $property){
+		foreach ($properties as $property) {
 			$showable=$this->showableProperty($property);
-			if($showable!==false){
+			if ($showable!==false) {
 				$result[]=$property;
 			}
 		}
@@ -280,12 +280,12 @@ 
 		return $this;
 	}
 
-	public function setValueFunction($index,$callback){
+	public function setValueFunction($index, $callback) {
 		$this->values[$index]=$callback;
 		return $this;
 	}
 
-	public function setIdentifierFunction($callback){
+	public function setIdentifierFunction($callback) {
 		$this->values["identifier"]=$callback;
 		return $this;
 	}
@@ -298,52 +298,52 @@ 
 		return $this->properties;
 	}
 
-	public function getCaption($index){
-		if(isset($this->captions[$index])){
+	public function getCaption($index) {
+		if (isset($this->captions[$index])) {
 			return $this->captions[$index];
 		}
-		if($this->properties[$index] instanceof \ReflectionProperty)
+		if ($this->properties[$index] instanceof \ReflectionProperty)
 			return $this->properties[$index]->getName();
-		elseif(\is_callable($this->properties[$index]))
+		elseif (\is_callable($this->properties[$index]))
 			return "";
 		else
 			return $this->properties[$index];
 	}
 
-	public function getCaptions(){
+	public function getCaptions() {
 		$hasGroupby=is_array($this->groupByFields);
 		$count=$this->count()-$this->getGroupByFieldsCount();
-		if(isset($this->captions)){
-			$captions= \array_values($this->captions);
+		if (isset($this->captions)) {
+			$captions=\array_values($this->captions);
 			$captionsSize=\sizeof($captions);
-			for($i=$captionsSize;$i<$count;$i++){
+			for ($i=$captionsSize; $i<$count; $i++) {
 				$captions[]="";
 			}
-		}else{
+		} else {
 			$captions=[];
 			$index=0;
-			if(!$hasGroupby){
-				while($index<$count){
+			if (!$hasGroupby) {
+				while ($index<$count) {
 						$captions[]=$this->getCaption($index++);
 				}
-			}else{
-				while($index<$count){
-					if($hasGroupby && array_search($index, $this->groupByFields)===false){
+			} else {
+				while ($index<$count) {
+					if ($hasGroupby && array_search($index, $this->groupByFields)===false) {
 						$captions[]=$this->getCaption($index);
 					}
 					$index++;
 				}
 			}
 		}
-		if(isset($this->captionCallback) && \is_callable($this->captionCallback)){
+		if (isset($this->captionCallback) && \is_callable($this->captionCallback)) {
 			$callback=$this->captionCallback;
-			$callback($captions,$this->instance);
+			$callback($captions, $this->instance);
 		}
 		return $captions;
 	}
 
-	public function setCaption($index,$caption){
-		if(isset($this->captions)===false)
+	public function setCaption($index, $caption) {
+		if (isset($this->captions)===false)
 			$this->captions=[];
 		$this->captions[$index]=$caption;
 		return $this;
@@ -361,7 +361,7 @@ 
 	 * @param callable $callback function called after the field compilation
 	 * @return InstanceViewer
 	 */
-	public function afterCompile($index,$callback){
+	public function afterCompile($index, $callback) {
 		$this->afterCompile[$index]=$callback;
 		return $this;
 	}
@@ -392,7 +392,7 @@ 
 	}
 	
 	public function getSimpleProperties() {
-		return array_filter($this->visibleProperties,function($item){
+		return array_filter($this->visibleProperties, function($item) {
 			return !(is_array($item) || is_object($item));
 		});
 	}
@@ -414,11 +414,11 @@ 
 	 * @param mixed $groupByFields
 	 */
 	public function setGroupByFields($groupByFields) {
-		$this->groupByFields = $groupByFields;
+		$this->groupByFields=$groupByFields;
 	}
 	
-	public function getGroupByFieldsCount(){
-		if(is_array($this->groupByFields)){
+	public function getGroupByFieldsCount() {
+		if (is_array($this->groupByFields)) {
 			return sizeof($this->groupByFields);
 		}
 		return 0;

Braces +48 added lines, -42 removed lines

@@ -24,8 +24,9 @@ 
 		$this->widgetIdentifier=$identifier;
 		$this->values=[];
 		$this->afterCompile=[];
-		if(isset($instance))
-			$this->setInstance($instance);
+		if(isset($instance)) {
+					$this->setInstance($instance);
+		}
 		$this->setCaptions($captions);
 		$this->captionCallback=NULL;
 		$this->defaultValueFunction=function($name,$value){return $value;};
@@ -61,7 +62,7 @@ 
 			while($index<$count){
 					$values[]=$this->getValue($index++);
 			}
-		}else{
+		} else{
 			while($index<$count){
 				if(array_search($index, $this->groupByFields)===false){
 					$values[]=$this->getValue($index);
@@ -73,14 +74,16 @@ 
 	}
 
 	public function getIdentifier($index=NULL){
-		if(!isset($index))
-			$index=self::$index;
+		if(!isset($index)) {
+					$index=self::$index;
+		}
 		$value=$index;
 		if(isset($this->values["identifier"])){
-			if(\is_string($this->values["identifier"]))
-				$value=JReflection::callMethod($this->instance, $this->values["identifier"], []);
-			else
-				$value=$this->values["identifier"]($index,$this->instance);
+			if(\is_string($this->values["identifier"])) {
+							$value=JReflection::callMethod($this->instance, $this->values["identifier"], []);
+			} else {
+							$value=$this->values["identifier"]($index,$this->instance);
+			}
 		}
 		return $value;
 	}
@@ -110,16 +113,16 @@ 
 		if($property instanceof \ReflectionProperty){
 			$value=$this->_getPropertyValue($property);
 			$propertyName=$property->getName();
-		}elseif(\is_callable($property) && array_search($property, ["system"])===false)
-			$value=$property($this->instance);
-		elseif(\is_array($property)){
+		} elseif(\is_callable($property) && array_search($property, ["system"])===false) {
+					$value=$property($this->instance);
+		} elseif(\is_array($property)){
 			$values=\array_map(function($v) use ($index){return $this->_getValue($v, $index);}, $property);
 			$value=\implode("", $values);
-		}elseif(\is_string($property)){
+		} elseif(\is_string($property)){
 			$value=$property;
 			if(isset($this->instance->{$property})){
 				$value=$this->instance->{$property};
-			}elseif(\method_exists($this->instance, $getter=JReflection::getterName($property))){
+			} elseif(\method_exists($this->instance, $getter=JReflection::getterName($property))){
 				$value=JReflection::callMethod($this->instance, $getter, []);
 			}
 		}
@@ -129,7 +132,7 @@ 
 	protected function _postGetValue($index,$propertyName,$value){
 		if(isset($this->values[$index])){
 			$value= $this->values[$index]($value,$this->instance,$index,self::$index);
-		}else{
+		} else{
 			$value=$this->_getDefaultValue($propertyName,$value, $index);
 		}
 		if(isset($this->afterCompile[$index])){
@@ -143,7 +146,7 @@ 
 	public function insertField($index,$field,$key=null){
 		if(isset($key)){
 			array_splice( $this->visibleProperties, $index, 0, [$key=>$field] );
-		}else{
+		} else{
 			array_splice( $this->visibleProperties, $index, 0, $field );
 		}
 		return $this;
@@ -164,17 +167,17 @@ 
 			if(isset($key)){
 				if(\is_array($vb[$index])){
 					$this->visibleProperties[$index][$key]=$field;
-				}else{
+				} else{
 					$this->visibleProperties[$index]=[$vb[$index],$key=>$field];
 				}
-			}else{
+			} else{
 				if(\is_array($vb[$index])){
 					$this->visibleProperties[$index][]=$field;
-				}else{
+				} else{
 					$this->visibleProperties[$index]=[$vb[$index],$field];
 				}
 			}
-		}else{
+		} else{
 			return $this->insertField($index, $field);
 		}
 		return $this;
@@ -183,7 +186,7 @@ 
 	public function addField($field,$key=null){
 		if(isset($key)){
 			$this->visibleProperties[]=[$key=>$field];
-		}else{
+		} else{
 			$this->visibleProperties[]=$field;
 		}
 		return $this;
@@ -210,9 +213,9 @@ 
 		$property=$this->getProperty($index);
 		if($property instanceof \ReflectionProperty){
 			$result=$property->getName();
-		}elseif(\is_callable($property)){
+		} elseif(\is_callable($property)){
 			$result=$this->visibleProperties[$index];
-		}else{
+		} else{
 			$result=$property;
 		}
 		return $result;
@@ -232,7 +235,7 @@ 
 		$this->reflect=new \ReflectionClass($instance);
 		if(JArray::count($this->visibleProperties)===0){
 			$this->properties=$this->getDefaultProperties();
-		}else{
+		} else{
 			foreach ($this->visibleProperties as $property){
 				$this->setInstanceProperty($property);
 			}
@@ -243,22 +246,23 @@ 
 	private function setInstanceProperty($property){
 		if(\is_callable($property)){
 			$this->properties[]=$property;
-		}elseif(\is_string($property)){
+		} elseif(\is_string($property)){
 			try{
 				$this->_beforeAddProperty(\sizeof($this->properties), $property);
 				$rProperty=$this->reflect->getProperty($property);
 				$this->properties[]=$rProperty;
-			}catch(\Exception $e){
+			} catch(\Exception $e){
 				$this->_beforeAddProperty(\sizeof($this->properties), $property);
 				$this->properties[]=$property;
 			}
-		}elseif(\is_int($property)){
+		} elseif(\is_int($property)){
 			$props=$this->getDefaultProperties();
-			if(isset($props[$property]))
-				$this->properties[]=$props[$property];
-				else
-					$this->properties[]=$property;
-		}else{
+			if(isset($props[$property])) {
+							$this->properties[]=$props[$property];
+			} else {
+									$this->properties[]=$property;
+				}
+		} else{
 			$this->properties[]=$property;
 		}
 	}
@@ -302,12 +306,13 @@ 
 		if(isset($this->captions[$index])){
 			return $this->captions[$index];
 		}
-		if($this->properties[$index] instanceof \ReflectionProperty)
-			return $this->properties[$index]->getName();
-		elseif(\is_callable($this->properties[$index]))
-			return "";
-		else
-			return $this->properties[$index];
+		if($this->properties[$index] instanceof \ReflectionProperty) {
+					return $this->properties[$index]->getName();
+		} elseif(\is_callable($this->properties[$index])) {
+					return "";
+		} else {
+					return $this->properties[$index];
+		}
 	}
 
 	public function getCaptions(){
@@ -319,14 +324,14 @@ 
 			for($i=$captionsSize;$i<$count;$i++){
 				$captions[]="";
 			}
-		}else{
+		} else{
 			$captions=[];
 			$index=0;
 			if(!$hasGroupby){
 				while($index<$count){
 						$captions[]=$this->getCaption($index++);
 				}
-			}else{
+			} else{
 				while($index<$count){
 					if($hasGroupby && array_search($index, $this->groupByFields)===false){
 						$captions[]=$this->getCaption($index);
@@ -343,8 +348,9 @@ 
 	}
 
 	public function setCaption($index,$caption){
-		if(isset($this->captions)===false)
-			$this->captions=[];
+		if(isset($this->captions)===false) {
+					$this->captions=[];
+		}
 		$this->captions[$index]=$caption;
 		return $this;
 	}

Ajax/common/html/HtmlDoubleElement.php

Spacing +19 added lines, -19 removed lines

@@ -27,15 +27,15 @@ 
 		return $this->content;
 	}
 
-	public function addContent($content,$before=false) {
+	public function addContent($content, $before=false) {
 		if (!\is_array($this->content)) {
-			if(isset($this->content))
-				$this->content=array ($this->content);
+			if (isset($this->content))
+				$this->content=array($this->content);
 			else
 				$this->content=array();
 		}
-		if($before)
-			array_unshift($this->content,$content);
+		if ($before)
+			array_unshift($this->content, $content);
 		else
 			$this->content []=$content;
 		return $this;
@@ -50,7 +50,7 @@ 
 		if ($this->content instanceof HtmlDoubleElement) {
 			$this->content->run($js);
 		} else if (\is_array($this->content)) {
-			foreach ( $this->content as $itemContent ) {
+			foreach ($this->content as $itemContent) {
 				if ($itemContent instanceof HtmlDoubleElement) {
 					$itemContent->run($js);
 				}
@@ -67,19 +67,19 @@ 
 		return $this;
 	}
 
-	public function getContentInstances($class){
-		return $this->_getContentInstances($class,$this->content);
+	public function getContentInstances($class) {
+		return $this->_getContentInstances($class, $this->content);
 	}
 
-	protected function _getContentInstances($class,$content){
+	protected function _getContentInstances($class, $content) {
 		$instances=[];
-		if($content instanceof $class){
+		if ($content instanceof $class) {
 			$instances[]=$content;
-		}elseif($content instanceof HtmlDoubleElement){
-			$instances=\array_merge($instances,$content->getContentInstances($class));
-		}elseif (\is_array($content)){
-			foreach ($content as $element){
-				$instances=\array_merge($instances,$this->_getContentInstances($class, $element));
+		}elseif ($content instanceof HtmlDoubleElement) {
+			$instances=\array_merge($instances, $content->getContentInstances($class));
+		}elseif (\is_array($content)) {
+			foreach ($content as $element) {
+				$instances=\array_merge($instances, $this->_getContentInstances($class, $element));
 			}
 		}
 		return $instances;
@@ -89,16 +89,16 @@ 
 	 * Transforms the element into a link
 	 * @return HtmlDoubleElement
 	 */
-	public function asLink($href=NULL,$target=NULL) {
+	public function asLink($href=NULL, $target=NULL) {
 		if (isset($href))
 			$this->setProperty("href", $href);
-		if(isset($target))
+		if (isset($target))
 			$this->setProperty("target", $target);
 		return $this->setTagName("a");
 	}
 	
-	public function getTextContent(){
-		if(is_array($this->content)){
+	public function getTextContent() {
+		if (is_array($this->content)) {
 			return strip_tags(implode("", $this->content));
 		}
 		return strip_tags($this->content);

Braces +18 added lines, -14 removed lines

@@ -29,15 +29,17 @@ 
 
 	public function addContent($content,$before=false) {
 		if (!\is_array($this->content)) {
-			if(isset($this->content))
-				$this->content=array ($this->content);
-			else
-				$this->content=array();
+			if(isset($this->content)) {
+							$this->content=array ($this->content);
+			} else {
+							$this->content=array();
+			}
+		}
+		if($before) {
+					array_unshift($this->content,$content);
+		} else {
+					$this->content []=$content;
 		}
-		if($before)
-			array_unshift($this->content,$content);
-		else
-			$this->content []=$content;
 		return $this;
 	}
 
@@ -75,9 +77,9 @@ 
 		$instances=[];
 		if($content instanceof $class){
 			$instances[]=$content;
-		}elseif($content instanceof HtmlDoubleElement){
+		} elseif($content instanceof HtmlDoubleElement){
 			$instances=\array_merge($instances,$content->getContentInstances($class));
-		}elseif (\is_array($content)){
+		} elseif (\is_array($content)){
 			foreach ($content as $element){
 				$instances=\array_merge($instances,$this->_getContentInstances($class, $element));
 			}
@@ -90,10 +92,12 @@ 
 	 * @return HtmlDoubleElement
 	 */
 	public function asLink($href=NULL,$target=NULL) {
-		if (isset($href))
-			$this->setProperty("href", $href);
-		if(isset($target))
-			$this->setProperty("target", $target);
+		if (isset($href)) {
+					$this->setProperty("href", $href);
+		}
+		if(isset($target)) {
+					$this->setProperty("target", $target);
+		}
 		return $this->setTagName("a");
 	}