phpMv / phpMv-UI

Ajax/semantic/widgets/datatable/DataTable.php

Doc Comments +31 added lines, -3 removed lines

@@ -38,6 +38,10 @@ 
 		parent::run($js);
 	}
 
+	/**
+	 * @param string $identifier
+	 * @param string $model
+	 */
 	public function __construct($identifier,$model,$modelInstance=NULL) {
 		parent::__construct($identifier, $model,$modelInstance);
 		$this->_instanceViewer=new InstanceViewer();
@@ -164,21 +168,34 @@ 
 		return $this;
 	}
 
+	/**
+	 * @param \Closure $field
+	 */
 	public function addField($field){
 		$this->_instanceViewer->addField($field);
 		return $this;
 	}
 
+	/**
+	 * @param integer $index
+	 * @param \Closure $field
+	 */
 	public function insertField($index,$field){
 		$this->_instanceViewer->insertField($index, $field);
 		return $this;
 	}
 
+	/**
+	 * @param \Closure $field
+	 */
 	public function insertInField($index,$field){
 		$this->_instanceViewer->insertInField($index, $field);
 		return $this;
 	}
 
+	/**
+	 * @param \Closure $callback
+	 */
 	public function setValueFunction($index,$callback){
 		$this->_instanceViewer->setValueFunction($index, $callback);
 		return $this;
@@ -222,16 +239,16 @@ 
 	/**
 	 * @param string $caption
 	 * @param callable $callback
-	 * @return callable
+	 * @return \Closure
 	 */
 	private function getFieldButtonCallable($caption,$callback=null){
 		return $this->getCallable($this->getFieldButton($caption),$callback);
 	}
 
 	/**
-	 * @param mixed $object
+	 * @param HtmlButton $object
 	 * @param callable $callback
-	 * @return callable
+	 * @return \Closure
 	 */
 	private function getCallable($object,$callback=null){
 		$result=function($instance) use($object,$callback){
@@ -290,12 +307,20 @@ 
 		return $this;
 	}
 
+	/**
+	 * @param string $icon
+	 * @param string $class
+	 */
 	private function addDefaultButton($icon,$class=null,$callback=null){
 		$bt=$this->getDefaultButton($icon,$class);
 		$this->addField($this->getCallable($bt,$callback));
 		return $this;
 	}
 
+	/**
+	 * @param string $icon
+	 * @param string $class
+	 */
 	private function insertDefaultButtonIn($index,$icon,$class=null,$callback=null){
 		$bt=$this->getDefaultButton($icon,$class);
 		$this->insertInField($index,$this->getCallable($bt,$callback));
@@ -458,6 +483,9 @@ 
 		return $this;
 	}
 
+	/**
+	 * @param string $prefix
+	 */
 	private function _getFieldIdentifier($prefix){
 		return $this->identifier."-{$prefix}-".$this->_instanceViewer->getIdentifier();
 	}

Spacing +121 added lines, -121 removed lines

@@ -28,8 +28,8 @@ 
 	protected $_compileParts;
 	protected $_toolbarPosition;
 
-	public function run(JsUtils $js){
-		if($this->_hasCheckboxes && isset($js)){
+	public function run(JsUtils $js) {
+		if ($this->_hasCheckboxes && isset($js)) {
 			$js->execOn("change", "#".$this->identifier." [name='selection[]']", "
 		var \$parentCheckbox=\$('#ck-main-ck-{$this->identifier}'),\$checkbox=\$('#{$this->identifier} [name=\"selection[]\"]'),allChecked=true,allUnchecked=true;
 		\$checkbox.each(function() {if($(this).prop('checked')){allUnchecked = false;}else{allChecked = false;}});
@@ -38,21 +38,21 @@ 
 		parent::run($js);
 	}
 
-	public function __construct($identifier,$model,$modelInstance=NULL) {
-		parent::__construct($identifier, $model,$modelInstance);
+	public function __construct($identifier, $model, $modelInstance=NULL) {
+		parent::__construct($identifier, $model, $modelInstance);
 		$this->_instanceViewer=new InstanceViewer();
-		$this->content=["table"=>new HtmlTable($identifier, 0,0)];
+		$this->content=["table"=>new HtmlTable($identifier, 0, 0)];
 		$this->_toolbarPosition=PositionInTable::BEFORETABLE;
 	}
 
-	public function compile(JsUtils $js=NULL,&$view=NULL){
+	public function compile(JsUtils $js=NULL, &$view=NULL) {
 		$this->_instanceViewer->setInstance($this->_model);
 		$captions=$this->_instanceViewer->getCaptions();
 
 		$table=$this->content["table"];
 
-		if($this->_hasCheckboxes){
-			$ck=new HtmlCheckbox("main-ck-".$this->identifier,"");
+		if ($this->_hasCheckboxes) {
+			$ck=new HtmlCheckbox("main-ck-".$this->identifier, "");
 			$ck->setOnChecked("$('#".$this->identifier." [name=%quote%selection[]%quote%]').prop('checked',true);");
 			$ck->setOnUnchecked("$('#".$this->identifier." [name=%quote%selection[]%quote%]').prop('checked',false);");
 			\array_unshift($captions, $ck);
@@ -60,43 +60,43 @@ 
 
 		$table->setRowCount(0, \sizeof($captions));
 		$table->setHeaderValues($captions);
-		if(isset($this->_compileParts))
+		if (isset($this->_compileParts))
 			$table->setCompileParts($this->_compileParts);
-		if(isset($this->_searchField)){
-			if(isset($js))
-				$this->_searchField->postOn("change", $this->_urls,"{'s':$(this).val()}","-#".$this->identifier." tbody",["preventDefault"=>false]);
+		if (isset($this->_searchField)) {
+			if (isset($js))
+				$this->_searchField->postOn("change", $this->_urls, "{'s':$(this).val()}", "-#".$this->identifier." tbody", ["preventDefault"=>false]);
 		}
 
 		$this->_generateContent($table);
 
-		if($this->_hasCheckboxes){
-			if($table->hasPart("thead"))
-				$table->getHeader()->getCell(0, 0)->addToProperty("class","no-sort");
+		if ($this->_hasCheckboxes) {
+			if ($table->hasPart("thead"))
+				$table->getHeader()->getCell(0, 0)->addToProperty("class", "no-sort");
 		}
 
-		if(isset($this->_pagination) && $this->_pagination->getVisible()){
+		if (isset($this->_pagination) && $this->_pagination->getVisible()) {
 			$this->_generatePagination($table);
 		}
-		if(isset($this->_toolbar)){
+		if (isset($this->_toolbar)) {
 			$this->_setToolbarPosition($table, $captions);
 		}
-		$this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE,"table",PositionInTable::AFTERTABLE]);
-		return parent::compile($js,$view);
+		$this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE, "table", PositionInTable::AFTERTABLE]);
+		return parent::compile($js, $view);
 	}
 
-	private function _generateContent($table){
+	private function _generateContent($table) {
 		$objects=$this->_modelInstance;
-		if(isset($this->_pagination)){
+		if (isset($this->_pagination)) {
 			$objects=$this->_pagination->getObjects($this->_modelInstance);
 		}
 		InstanceViewer::setIndex(0);
-		$table->fromDatabaseObjects($objects, function($instance){
+		$table->fromDatabaseObjects($objects, function($instance) {
 			$this->_instanceViewer->setInstance($instance);
-			$result= $this->_instanceViewer->getValues();
-			if($this->_hasCheckboxes){
-				$ck=new HtmlCheckbox("ck-".$this->identifier,"");
+			$result=$this->_instanceViewer->getValues();
+			if ($this->_hasCheckboxes) {
+				$ck=new HtmlCheckbox("ck-".$this->identifier, "");
 				$field=$ck->getField();
-				$field->setProperty("value",$this->_instanceViewer->getIdentifier());
+				$field->setProperty("value", $this->_instanceViewer->getIdentifier());
 				$field->setProperty("name", "selection[]");
 				\array_unshift($result, $ck);
 			}
@@ -104,25 +104,25 @@ 
 		});
 	}
 
-	private function _generatePagination($table){
+	private function _generatePagination($table) {
 		$footer=$table->getFooter();
 		$footer->mergeCol();
-		$menu=new HtmlPaginationMenu("pagination-".$this->identifier,$this->_pagination->getPagesNumbers());
+		$menu=new HtmlPaginationMenu("pagination-".$this->identifier, $this->_pagination->getPagesNumbers());
 		$menu->floatRight();
 		$menu->setActiveItem($this->_pagination->getPage()-1);
 		$footer->setValues($menu);
-		$menu->postOnClick($this->_urls,"{'p':$(this).attr('data-page')}","-#".$this->identifier." tbody",["preventDefault"=>false]);
+		$menu->postOnClick($this->_urls, "{'p':$(this).attr('data-page')}", "-#".$this->identifier." tbody", ["preventDefault"=>false]);
 	}
 
-	private function _setToolbarPosition($table,$captions){
-		switch ($this->_toolbarPosition){
+	private function _setToolbarPosition($table, $captions) {
+		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;
 		}
 	}
@@ -134,12 +134,12 @@ 
 	 * @param callable $callback function called after the field compilation
 	 * @return \Ajax\semantic\widgets\datatable\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) {
 		$row=$table->getPart($part)->addRow(\sizeof($captions));
 		$row->mergeCol();
 		$row->setValues([$this->_toolbar]);
@@ -154,42 +154,42 @@ 
 		return $this;
 	}
 
-	public function setCaptions($captions){
+	public function setCaptions($captions) {
 		$this->_instanceViewer->setCaptions($captions);
 		return $this;
 	}
 
-	public function setFields($fields){
+	public function setFields($fields) {
 		$this->_instanceViewer->setVisibleProperties($fields);
 		return $this;
 	}
 
-	public function addField($field){
+	public function addField($field) {
 		$this->_instanceViewer->addField($field);
 		return $this;
 	}
 
-	public function insertField($index,$field){
+	public function insertField($index, $field) {
 		$this->_instanceViewer->insertField($index, $field);
 		return $this;
 	}
 
-	public function insertInField($index,$field){
+	public function insertInField($index, $field) {
 		$this->_instanceViewer->insertInField($index, $field);
 		return $this;
 	}
 
-	public function setValueFunction($index,$callback){
+	public function setValueFunction($index, $callback) {
 		$this->_instanceViewer->setValueFunction($index, $callback);
 		return $this;
 	}
 
-	public function setIdentifierFunction($callback){
+	public function setIdentifierFunction($callback) {
 		$this->_instanceViewer->setIdentifierFunction($callback);
 		return $this;
 	}
 
-	public function getHtmlComponent(){
+	public function getHtmlComponent() {
 		return $this->content["table"];
 	}
 
@@ -202,8 +202,8 @@ 
 		return $this;
 	}
 
-	public function paginate($items_per_page=10,$page=1){
-		$this->_pagination=new Pagination($items_per_page,4,$page);
+	public function paginate($items_per_page=10, $page=1) {
+		$this->_pagination=new Pagination($items_per_page, 4, $page);
 	}
 
 	public function getHasCheckboxes() {
@@ -215,7 +215,7 @@ 
 		return $this;
 	}
 
-	public function refresh($compileParts=["tbody"]){
+	public function refresh($compileParts=["tbody"]) {
 		$this->_compileParts=$compileParts;
 		return $this;
 	}
@@ -224,8 +224,8 @@ 
 	 * @param callable $callback
 	 * @return callable
 	 */
-	private function getFieldButtonCallable($caption,$callback=null){
-		return $this->getCallable($this->getFieldButton($caption),$callback);
+	private function getFieldButtonCallable($caption, $callback=null) {
+		return $this->getCallable($this->getFieldButton($caption), $callback);
 	}
 
 	/**
@@ -233,11 +233,11 @@ 
 	 * @param callable $callback
 	 * @return callable
 	 */
-	private function getCallable($object,$callback=null){
-		$result=function($instance) use($object,$callback){
-			if(isset($callback)){
-				if(\is_callable($callback)){
-					$callback($object,$instance);
+	private function getCallable($object, $callback=null) {
+		$result=function($instance) use($object, $callback){
+			if (isset($callback)) {
+				if (\is_callable($callback)) {
+					$callback($object, $instance);
 				}
 			}
 			return $object;
@@ -249,9 +249,9 @@ 
 	 * @param string $caption
 	 * @return HtmlButton
 	 */
-	private function getFieldButton($caption){
-			$bt=new HtmlButton("",$caption);
-			$bt->setProperty("data-ajax",$this->_instanceViewer->getIdentifier());
+	private function getFieldButton($caption) {
+			$bt=new HtmlButton("", $caption);
+			$bt->setProperty("data-ajax", $this->_instanceViewer->getIdentifier());
 			return $bt;
 	}
 
@@ -261,8 +261,8 @@ 
 	 * @param callable $callback
 	 * @return \Ajax\semantic\widgets\datatable\DataTable
 	 */
-	public function addFieldButton($caption,$callback=null){
-		$this->addField($this->getFieldButtonCallable($caption,$callback));
+	public function addFieldButton($caption, $callback=null) {
+		$this->addField($this->getFieldButtonCallable($caption, $callback));
 		return $this;
 	}
 
@@ -273,8 +273,8 @@ 
 	 * @param callable $callback
 	 * @return \Ajax\semantic\widgets\datatable\DataTable
 	 */
-	public function insertFieldButton($index,$caption,$callback=null){
-		$this->insertField($index, $this->getFieldButtonCallable($caption,$callback));
+	public function insertFieldButton($index, $caption, $callback=null) {
+		$this->insertField($index, $this->getFieldButtonCallable($caption, $callback));
 		return $this;
 	}
 
@@ -285,55 +285,55 @@ 
 	 * @param callable $callback
 	 * @return \Ajax\semantic\widgets\datatable\DataTable
 	 */
-	public function insertInFieldButton($index,$caption,$callback=null){
-		$this->insertInField($index, $this->getFieldButtonCallable($caption,$callback));
+	public function insertInFieldButton($index, $caption, $callback=null) {
+		$this->insertInField($index, $this->getFieldButtonCallable($caption, $callback));
 		return $this;
 	}
 
-	private function addDefaultButton($icon,$class=null,$callback=null){
-		$bt=$this->getDefaultButton($icon,$class);
-		$this->addField($this->getCallable($bt,$callback));
+	private function addDefaultButton($icon, $class=null, $callback=null) {
+		$bt=$this->getDefaultButton($icon, $class);
+		$this->addField($this->getCallable($bt, $callback));
 		return $this;
 	}
 
-	private function insertDefaultButtonIn($index,$icon,$class=null,$callback=null){
-		$bt=$this->getDefaultButton($icon,$class);
-		$this->insertInField($index,$this->getCallable($bt,$callback));
+	private function insertDefaultButtonIn($index, $icon, $class=null, $callback=null) {
+		$bt=$this->getDefaultButton($icon, $class);
+		$this->insertInField($index, $this->getCallable($bt, $callback));
 		return $this;
 	}
 
-	private function getDefaultButton($icon,$class=null){
+	private function getDefaultButton($icon, $class=null) {
 		$bt=$this->getFieldButton("");
 		$bt->asIcon($icon);
-		if(isset($class))
+		if (isset($class))
 			$bt->addToProperty("class", $class);
 		return $bt;
 	}
 
-	public function addDeleteButton($callback=null){
-		return $this->addDefaultButton("remove","delete red basic",$callback);
+	public function addDeleteButton($callback=null) {
+		return $this->addDefaultButton("remove", "delete red basic", $callback);
 	}
 
-	public function addEditButton($callback=null){
-		return $this->addDefaultButton("edit","edit basic",$callback);
+	public function addEditButton($callback=null) {
+		return $this->addDefaultButton("edit", "edit basic", $callback);
 	}
 
-	public function addEditDeleteButtons($callbackEdit=null,$callbackDelete=null){
+	public function addEditDeleteButtons($callbackEdit=null, $callbackDelete=null) {
 		$this->addEditButton($callbackEdit);
 		$index=$this->_instanceViewer->visiblePropertiesCount()-1;
-		$this->insertDeleteButtonIn($index,$callbackDelete);
+		$this->insertDeleteButtonIn($index, $callbackDelete);
 		return $this;
 	}
 
-	public function insertDeleteButtonIn($index,$callback=null){
-		return $this->insertDefaultButtonIn($index,"remove","delete red basic",$callback);
+	public function insertDeleteButtonIn($index, $callback=null) {
+		return $this->insertDefaultButtonIn($index, "remove", "delete red basic", $callback);
 	}
 
-	public function insertEditButtonIn($index,$callback=null){
-		return $this->insertDefaultButtonIn($index,"edit","edit basic",$callback);
+	public function insertEditButtonIn($index, $callback=null) {
+		return $this->insertDefaultButtonIn($index, "edit", "edit basic", $callback);
 	}
 
-	public function setSelectable(){
+	public function setSelectable() {
 		$this->content["table"]->setSelectable();
 		return $this;
 	}
@@ -341,8 +341,8 @@ 
 	/**
 	 * @return \Ajax\semantic\html\collections\menus\HtmlMenu
 	 */
-	public function getToolbar(){
-		if(isset($this->_toolbar)===false){
+	public function getToolbar() {
+		if (isset($this->_toolbar)===false) {
 			$this->_toolbar=new HtmlMenu("toolbar-".$this->identifier);
 			$this->_toolbar->setSecondary();
 		}
@@ -353,37 +353,37 @@ 
 	 * @param unknown $element
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
-	public function addInToolbar($element){
+	public function addInToolbar($element) {
 		$tb=$this->getToolbar();
 		return $tb->addItem($element);
 	}
 
-	public function addItemInToolbar($caption,$icon=NULL){
+	public function addItemInToolbar($caption, $icon=NULL) {
 		$result=$this->addInToolbar($caption);
 		$result->addIcon($icon);
 		return $result;
 	}
 
-	public function addButtonInToolbar($caption){
-		$bt=new HtmlButton("",$caption);
+	public function addButtonInToolbar($caption) {
+		$bt=new HtmlButton("", $caption);
 		return $this->addInToolbar($bt);
 	}
 
-	public function addLabelledIconButtonInToolbar($caption,$icon,$before=true,$labeled=false){
-		$bt=new HtmlButton("",$caption);
-		$bt->addIcon($icon,$before,$labeled);
+	public function addLabelledIconButtonInToolbar($caption, $icon, $before=true, $labeled=false) {
+		$bt=new HtmlButton("", $caption);
+		$bt->addIcon($icon, $before, $labeled);
 		return $this->addInToolbar($bt);
 	}
 
 
-	public function addSearchInToolbar(){
+	public function addSearchInToolbar() {
 		return $this->addInToolbar($this->getSearchField())->setPosition("right");
 	}
 
-	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;
 	}
@@ -393,36 +393,36 @@ 
 		return $this;
 	}
 
-	public function fieldAsImage($index,$size=Size::SMALL,$circular=false){
-		$this->setValueFunction($index,function($img) use($size,$circular){
-			$image=new HtmlImage($this->_getFieldIdentifier("image"),$img);$image->setSize($size);if($circular)$image->setCircular();
+	public function fieldAsImage($index, $size=Size::SMALL, $circular=false) {
+		$this->setValueFunction($index, function($img) use($size, $circular){
+			$image=new HtmlImage($this->_getFieldIdentifier("image"), $img); $image->setSize($size); if ($circular)$image->setCircular();
 			return $image;
 			}
 		);
 		return $this;
 	}
 
-	public function fieldAsAvatar($index){
-		$this->setValueFunction($index,function($img){return (new HtmlImage("",$img))->asAvatar();});
+	public function fieldAsAvatar($index) {
+		$this->setValueFunction($index, function($img) {return (new HtmlImage("", $img))->asAvatar(); });
 		return $this;
 	}
 
-	public function fieldAsRadio($index,$name=NULL){
-		$this->setValueFunction($index,function($value)use ($index,$name){
-			if(isset($name)===false){
+	public function fieldAsRadio($index, $name=NULL) {
+		$this->setValueFunction($index, function($value)use ($index, $name){
+			if (isset($name)===false) {
 				$name=$this->_instanceViewer->getCaption($index)."[]";
 			}
-			$radio=new HtmlRadio($this->_getFieldIdentifier("radio"),$name,$value,$value);
+			$radio=new HtmlRadio($this->_getFieldIdentifier("radio"), $name, $value, $value);
 			return $radio;
 			}
 		);
 		return $this;
 	}
 
-	public function fieldAsInput($index,$name=NULL,$type="text",$placeholder=""){
-		$this->setValueFunction($index,function($value) use($index,$name,$type,$placeholder){
-			$input=new HtmlInput($this->_getFieldIdentifier("input"),$type,$value,$placeholder);
-			if(isset($name)===false){
+	public function fieldAsInput($index, $name=NULL, $type="text", $placeholder="") {
+		$this->setValueFunction($index, function($value) use($index, $name, $type, $placeholder){
+			$input=new HtmlInput($this->_getFieldIdentifier("input"), $type, $value, $placeholder);
+			if (isset($name)===false) {
 				$name=$this->_instanceViewer->getCaption($index)."[]";
 			}
 			$input->getField()->setProperty("name", $name);
@@ -433,32 +433,32 @@ 
 		return $this;
 	}
 
-	public function fieldAsCheckbox($index,$name=NULL){
-		$this->setValueFunction($index,function($value) use($index,$name){
-			$checkbox=new HtmlCheckbox($this->_getFieldIdentifier("ck"),"",$value);
+	public function fieldAsCheckbox($index, $name=NULL) {
+		$this->setValueFunction($index, function($value) use($index, $name){
+			$checkbox=new HtmlCheckbox($this->_getFieldIdentifier("ck"), "", $value);
 			$checkbox->setChecked(JString::isBooleanTrue($value));
-			if(isset($name)===false){
+			if (isset($name)===false) {
 				$name=$this->_instanceViewer->getCaption($index)."[]";
 			}
 			$checkbox->getField()->setProperty("name", $name);
-			return $checkbox;}
+			return $checkbox; }
 		);
 		return $this;
 	}
 
-	public function fieldAsDropDown($index,$elements=[],$multiple=false,$name=NULL){
-		$this->setValueFunction($index,function($value) use($index,$elements,$multiple,$name){
-			$dd=new HtmlDropdown($this->_getFieldIdentifier("dd"),$value,$elements);
-			if(isset($name)===false){
+	public function fieldAsDropDown($index, $elements=[], $multiple=false, $name=NULL) {
+		$this->setValueFunction($index, function($value) use($index, $elements, $multiple, $name){
+			$dd=new HtmlDropdown($this->_getFieldIdentifier("dd"), $value, $elements);
+			if (isset($name)===false) {
 				$name=$this->_instanceViewer->getCaption($index)."[]";
 			}
-			$dd->asSelect($name,$multiple);
-			return $dd;}
+			$dd->asSelect($name, $multiple);
+			return $dd; }
 		);
 		return $this;
 	}
 
-	private function _getFieldIdentifier($prefix){
+	private function _getFieldIdentifier($prefix) {
 		return $this->identifier."-{$prefix}-".$this->_instanceViewer->getIdentifier();
 	}
 }
\ No newline at end of file

Braces +15 added lines, -9 removed lines

@@ -60,18 +60,21 @@ 
 
 		$table->setRowCount(0, \sizeof($captions));
 		$table->setHeaderValues($captions);
-		if(isset($this->_compileParts))
-			$table->setCompileParts($this->_compileParts);
+		if(isset($this->_compileParts)) {
+					$table->setCompileParts($this->_compileParts);
+		}
 		if(isset($this->_searchField)){
-			if(isset($js))
-				$this->_searchField->postOn("change", $this->_urls,"{'s':$(this).val()}","-#".$this->identifier." tbody",["preventDefault"=>false]);
+			if(isset($js)) {
+							$this->_searchField->postOn("change", $this->_urls,"{'s':$(this).val()}","-#".$this->identifier." tbody",["preventDefault"=>false]);
+			}
 		}
 
 		$this->_generateContent($table);
 
 		if($this->_hasCheckboxes){
-			if($table->hasPart("thead"))
-				$table->getHeader()->getCell(0, 0)->addToProperty("class","no-sort");
+			if($table->hasPart("thead")) {
+							$table->getHeader()->getCell(0, 0)->addToProperty("class","no-sort");
+			}
 		}
 
 		if(isset($this->_pagination) && $this->_pagination->getVisible()){
@@ -305,8 +308,9 @@ 
 	private function getDefaultButton($icon,$class=null){
 		$bt=$this->getFieldButton("");
 		$bt->asIcon($icon);
-		if(isset($class))
-			$bt->addToProperty("class", $class);
+		if(isset($class)) {
+					$bt->addToProperty("class", $class);
+		}
 		return $bt;
 	}
 
@@ -395,7 +399,9 @@ 
 
 	public function fieldAsImage($index,$size=Size::SMALL,$circular=false){
 		$this->setValueFunction($index,function($img) use($size,$circular){
-			$image=new HtmlImage($this->_getFieldIdentifier("image"),$img);$image->setSize($size);if($circular)$image->setCircular();
+			$image=new HtmlImage($this->_getFieldIdentifier("image"),$img);$image->setSize($size);if($circular) {
+				$image->setCircular();
+			}
 			return $image;
 			}
 		);

Ajax/service/JString.php

Spacing +9 added lines, -9 removed lines

@@ -2,33 +2,33 @@
 namespace Ajax\service;
 class JString {
 
-	public static function contains($hay,$needle){
-		return strpos($hay, $needle) !== false;
+	public static function contains($hay, $needle) {
+		return strpos($hay, $needle)!==false;
 	}
 	public static function startswith($hay, $needle) {
-		return substr($hay, 0, strlen($needle)) === $needle;
+		return substr($hay, 0, strlen($needle))===$needle;
 	}
 
 	public static function endswith($hay, $needle) {
-		return substr($hay, -strlen($needle)) === $needle;
+		return substr($hay, -strlen($needle))===$needle;
 	}
 
-	public static function isNull($s){
+	public static function isNull($s) {
 		return (!isset($s) || NULL===$s || ""===$s);
 	}
-	public static function isNotNull($s){
+	public static function isNotNull($s) {
 		return (isset($s) && NULL!==$s && ""!==$s);
 	}
 
-	public static function isBoolean($value){
+	public static function isBoolean($value) {
 		return \is_bool($value) || $value==1 || $value==0;
 	}
 
-	public static function isBooleanTrue($value){
+	public static function isBooleanTrue($value) {
 		return $value==1 || $value;
 	}
 
-	public static function isBooleanFalse($value){
+	public static function isBooleanFalse($value) {
 		return $value==0 || !$value;
 	}
 }
\ No newline at end of file

Ajax/semantic/widgets/datatable/InstanceViewer.php

Spacing +57 added lines, -57 removed lines

@@ -12,25 +12,25 @@ 
 	private $afterCompile;
 	private static $index=0;
 
-	public function __construct($instance=NULL,$captions=NULL){
+	public function __construct($instance=NULL, $captions=NULL) {
 		$this->values=[];
 		$this->afterCompile=[];
-		if(isset($instance))
+		if (isset($instance))
 			$this->setInstance($instance);
 		$this->setCaptions($captions);
 	}
 
-	public function getCaption($index){
-		if($this->properties[$index] instanceof \ReflectionProperty)
+	public function getCaption($index) {
+		if ($this->properties[$index] instanceof \ReflectionProperty)
 			return $this->properties[$index]->getName();
 		else
 			return $this->properties[$index];
 	}
 
-	public function getCaptions(){
-		if(isset($this->captions)){
-			$result= $this->captions;
-			for($i=\sizeof($result);$i<$this->count();$i++){
+	public function getCaptions() {
+		if (isset($this->captions)) {
+			$result=$this->captions;
+			for ($i=\sizeof($result); $i<$this->count(); $i++) {
 				$result[]="";
 			}
 			return $result;
@@ -38,122 +38,122 @@ 
 		$captions=[];
 		$index=0;
 		$count=$this->count();
-		while($index<$count){
+		while ($index<$count) {
 			$captions[]=$this->getCaption($index++);
 		}
 		return $captions;
 	}
 
-	public function getValues(){
+	public function getValues() {
 		$values=[];
 		$index=0;
 		$count=$this->count();
-		while($index<$count){
+		while ($index<$count) {
 			$values[]=$this->getValue($index++);
 		}
 		return $values;
 	}
 
-	public function getIdentifier(){
+	public function getIdentifier() {
 		$value=self::$index;
-		if(isset($this->values["identifier"]))
-			$value=$this->values["identifier"](self::$index,$this->instance);
+		if (isset($this->values["identifier"]))
+			$value=$this->values["identifier"](self::$index, $this->instance);
 		self::$index++;
 		return $value;
 	}
 
-	public function getValue($index){
+	public function getValue($index) {
 		$property=$this->properties[$index];
 		return $this->_getValue($property, $index);
 	}
 
-	private function _getValue($property,$index){
-		if($property instanceof \ReflectionProperty){
+	private function _getValue($property, $index) {
+		if ($property instanceof \ReflectionProperty) {
 			$property->setAccessible(true);
 			$value=$property->getValue($this->instance);
-			if(isset($this->values[$index])){
-				$value= $this->values[$index]($value);
+			if (isset($this->values[$index])) {
+				$value=$this->values[$index]($value);
 			}
-		}else{
-			if(\is_callable($property))
+		} else {
+			if (\is_callable($property))
 				$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);
-			}else
+			} else
 				$value=$property;
 		}
-		if(isset($this->afterCompile[$index])){
-			if(\is_callable($this->afterCompile[$index])){
-				$this->afterCompile[$index]($value,$this->instance,$index);
+		if (isset($this->afterCompile[$index])) {
+			if (\is_callable($this->afterCompile[$index])) {
+				$this->afterCompile[$index]($value, $this->instance, $index);
 			}
 		}
 		return $value;
 	}
 
-	public function insertField($index,$field){
-		array_splice( $this->visibleProperties, $index, 0, $field );
+	public function insertField($index, $field) {
+		array_splice($this->visibleProperties, $index, 0, $field);
 		return $this;
 	}
 
-	public function insertInField($index,$field){
+	public function insertInField($index, $field) {
 		$vb=$this->visibleProperties;
-		if(isset($vb[$index])){
-			if(\is_array($vb[$index])){
+		if (isset($vb[$index])) {
+			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){
+	public function addField($field) {
 		$this->visibleProperties[]=$field;
 		return $this;
 	}
 
-	public function count(){
+	public function count() {
 		return \sizeof($this->properties);
 	}
 
-	public function visiblePropertiesCount(){
+	public function visiblePropertiesCount() {
 		return \sizeof($this->visibleProperties);
 	}
 
-	private function showableProperty(\ReflectionProperty $rProperty){
-		return JString::startswith($rProperty->getName(),"_")===false;
+	private 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(\sizeof($this->visibleProperties)===0){
+		if (\sizeof($this->visibleProperties)===0) {
 			$this->properties=$this->getDefaultProperties();
-		}else{
-			foreach ($this->visibleProperties as $property){
-				if(\is_callable($property)){
+		} else {
+			foreach ($this->visibleProperties as $property) {
+				if (\is_callable($property)) {
 					$this->properties[]=$property;
-				}elseif(\is_string($property)){
-					try{
+				}elseif (\is_string($property)) {
+					try {
 						$rProperty=$this->reflect->getProperty($property);
 						$this->properties[]=$rProperty;
-					}catch(\Exception $e){
+					}catch (\Exception $e) {
 						$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;
 				}
 			}
@@ -161,12 +161,12 @@ 
 		return $this;
 	}
 
-	private function getDefaultProperties(){
+	private 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;
 			}
 		}
@@ -183,12 +183,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;
 	}
@@ -208,7 +208,7 @@ 
 	 * @param callable $callback function called after the field compilation
 	 * @return \Ajax\semantic\widgets\datatable\InstanceViewer
 	 */
-	public function afterCompile($index,$callback){
+	public function afterCompile($index, $callback) {
 		$this->afterCompile[$index]=$callback;
 		return $this;
 	}

Braces +30 added lines, -25 removed lines

@@ -15,16 +15,18 @@ 
 	public function __construct($instance=NULL,$captions=NULL){
 		$this->values=[];
 		$this->afterCompile=[];
-		if(isset($instance))
-			$this->setInstance($instance);
+		if(isset($instance)) {
+					$this->setInstance($instance);
+		}
 		$this->setCaptions($captions);
 	}
 
 	public function getCaption($index){
-		if($this->properties[$index] instanceof \ReflectionProperty)
-			return $this->properties[$index]->getName();
-		else
-			return $this->properties[$index];
+		if($this->properties[$index] instanceof \ReflectionProperty) {
+					return $this->properties[$index]->getName();
+		} else {
+					return $this->properties[$index];
+		}
 	}
 
 	public function getCaptions(){
@@ -56,8 +58,9 @@ 
 
 	public function getIdentifier(){
 		$value=self::$index;
-		if(isset($this->values["identifier"]))
-			$value=$this->values["identifier"](self::$index,$this->instance);
+		if(isset($this->values["identifier"])) {
+					$value=$this->values["identifier"](self::$index,$this->instance);
+		}
 		self::$index++;
 		return $value;
 	}
@@ -74,14 +77,15 @@ 
 			if(isset($this->values[$index])){
 				$value= $this->values[$index]($value);
 			}
-		}else{
-			if(\is_callable($property))
-				$value=$property($this->instance);
-			elseif(\is_array($property)){
+		} else{
+			if(\is_callable($property)) {
+							$value=$property($this->instance);
+			} elseif(\is_array($property)){
 				$values=\array_map(function($v) use ($index){return $this->_getValue($v, $index);}, $property);
 				$value=\implode("", $values);
-			}else
-				$value=$property;
+			} else {
+							$value=$property;
+			}
 		}
 		if(isset($this->afterCompile[$index])){
 			if(\is_callable($this->afterCompile[$index])){
@@ -101,10 +105,10 @@ 
 		if(isset($vb[$index])){
 			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;
@@ -136,24 +140,25 @@ 
 		$this->reflect=new \ReflectionClass($instance);
 		if(\sizeof($this->visibleProperties)===0){
 			$this->properties=$this->getDefaultProperties();
-		}else{
+		} else{
 			foreach ($this->visibleProperties as $property){
 				if(\is_callable($property)){
 					$this->properties[]=$property;
-				}elseif(\is_string($property)){
+				} elseif(\is_string($property)){
 					try{
 						$rProperty=$this->reflect->getProperty($property);
 						$this->properties[]=$rProperty;
-					}catch(\Exception $e){
+					} catch(\Exception $e){
 						$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;
 				}
 			}

Ajax/semantic/widgets/datatable/PositionInTable.php

Spacing +1 added lines, -1 removed lines

@@ -3,5 +3,5 @@
 use Ajax\common\BaseEnum;
 
 abstract class PositionInTable extends BaseEnum {
-	const BEFORETABLE="beforeTable",AFTERTABLE="afterTable",HEADER="thead",FOOTER="tfoot",BODY="tbody";
+	const BEFORETABLE="beforeTable", AFTERTABLE="afterTable", HEADER="thead", FOOTER="tfoot", BODY="tbody";
 }
\ No newline at end of file