phpMv / phpMv-UI

Ajax/semantic/widgets/base/FieldAsTrait.php

Doc Comments +8 added lines

@@ -24,6 +24,10 @@ 
 trait FieldAsTrait{
 
 	abstract protected function _getFieldIdentifier($prefix);
+
+	/**
+	 * @param \Closure $callback
+	 */
 	abstract public function setValueFunction($index,$callback);
 
 	/**
@@ -49,6 +53,10 @@ 
 
 	protected function _addRules($element,&$attributes){}
 
+	/**
+	 * @param \Closure $elementCallback
+	 * @param string $prefix
+	 */
 	protected function _fieldAs($elementCallback,$index,$attributes=NULL,$prefix=null){
 		$this->setValueFunction($index,function($value) use ($index,&$attributes,$elementCallback,$prefix){
 			$name=$this->_instanceViewer->getCaption($index)."[]";

Unused Use Statements -2 removed lines

@@ -1,7 +1,5 @@
 <?php
 namespace Ajax\semantic\widgets\base;
-use Ajax\semantic\html\elements\HtmlInput;
-use Ajax\semantic\html\modules\checkbox\HtmlCheckbox;
 use Ajax\service\JString;
 use Ajax\semantic\html\modules\HtmlDropdown;
 use Ajax\semantic\html\elements\HtmlImage;

Spacing +56 added lines, -56 removed lines

@@ -21,43 +21,43 @@ 
  * @property mixed _modelInstance
  */
 
-trait FieldAsTrait{
+trait FieldAsTrait {
 
 	abstract protected function _getFieldIdentifier($prefix);
-	abstract public function setValueFunction($index,$callback);
+	abstract public function setValueFunction($index, $callback);
 
 	/**
 	 * @param HtmlFormField $element
 	 * @param array $attributes
 	 */
-	protected function _applyAttributes($element,&$attributes,$index){
+	protected function _applyAttributes($element, &$attributes, $index) {
 		$this->_addRules($element, $attributes);
-		if(isset($attributes["callback"])){
+		if (isset($attributes["callback"])) {
 			$callback=$attributes["callback"];
-			if(\is_callable($callback)){
-				$callback($element,$this->_modelInstance,$index);
+			if (\is_callable($callback)) {
+				$callback($element, $this->_modelInstance, $index);
 				unset($attributes["callback"]);
 			}
 		}
 		$element->fromArray($attributes);
 	}
 
-	private function _getLabelField($caption,$icon=NULL){
-		$label=new HtmlLabel($this->_getFieldIdentifier("lbl"),$caption,$icon);
+	private function _getLabelField($caption, $icon=NULL) {
+		$label=new HtmlLabel($this->_getFieldIdentifier("lbl"), $caption, $icon);
 		return $label;
 	}
 
-	protected function _addRules($element,&$attributes){}
+	protected function _addRules($element, &$attributes) {}
 
-	protected function _fieldAs($elementCallback,$index,$attributes=NULL,$prefix=null){
-		$this->setValueFunction($index,function($value) use ($index,&$attributes,$elementCallback,$prefix){
+	protected function _fieldAs($elementCallback, $index, $attributes=NULL, $prefix=null) {
+		$this->setValueFunction($index, function($value) use ($index, &$attributes, $elementCallback, $prefix){
 			$name=$this->_instanceViewer->getCaption($index)."[]";
-			if(isset($attributes["name"])){
+			if (isset($attributes["name"])) {
 				$name=$attributes["name"];
 			}
-			$element=$elementCallback($this->_getFieldIdentifier($prefix),$name,$value,"");
-			if(\is_array($attributes))
-				$this->_applyAttributes($element, $attributes,$index);
+			$element=$elementCallback($this->_getFieldIdentifier($prefix), $name, $value, "");
+			if (\is_array($attributes))
+				$this->_applyAttributes($element, $attributes, $index);
 			$element->setDisabled(!$this->_edition);
 			return $element;
 		});
@@ -65,94 +65,94 @@ 
 	}
 
 
-	public function fieldAsProgress($index,$label=NULL, $attributes=array()){
-		$this->setValueFunction($index,function($value) use($label,$attributes){
-			$pb=new HtmlProgress($this->_getFieldIdentifier("pb"),$value,$label,$attributes);
+	public function fieldAsProgress($index, $label=NULL, $attributes=array()) {
+		$this->setValueFunction($index, function($value) use($label, $attributes){
+			$pb=new HtmlProgress($this->_getFieldIdentifier("pb"), $value, $label, $attributes);
 			return $pb;
 		});
 			return $this;
 	}
 
-	public function fieldAsRating($index,$max=5, $icon=""){
-		$this->setValueFunction($index,function($value) use($max,$icon){
-			$rating=new HtmlRating($this->_getFieldIdentifier("rat"),$value,$max,$icon);
+	public function fieldAsRating($index, $max=5, $icon="") {
+		$this->setValueFunction($index, function($value) use($max, $icon){
+			$rating=new HtmlRating($this->_getFieldIdentifier("rat"), $value, $max, $icon);
 			return $rating;
 		});
 			return $this;
 	}
 
-	public function fieldAsLabel($index,$icon=NULL){
-		$this->setValueFunction($index,function($caption) use($icon){
-			$lbl=$this->_getLabelField($caption,$icon);
+	public function fieldAsLabel($index, $icon=NULL) {
+		$this->setValueFunction($index, function($caption) use($icon){
+			$lbl=$this->_getLabelField($caption, $icon);
 			return $lbl;
 		});
 			return $this;
 	}
 
-	public function fieldAsHeader($index,$niveau=1,$icon=NULL,$attributes=NULL){
-		return $this->_fieldAs(function($id,$name,$value) use($niveau,$icon){
-			$header=new HtmlHeader($id,$niveau,$value);
-			if(isset($icon))
+	public function fieldAsHeader($index, $niveau=1, $icon=NULL, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value) use($niveau, $icon){
+			$header=new HtmlHeader($id, $niveau, $value);
+			if (isset($icon))
 				$header->asIcon($icon, $value);
 			return $header;
-		}, $index,$attributes,"header");
+		}, $index, $attributes, "header");
 	}
 
 
-	public function fieldAsImage($index,$size=Size::MINI,$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::MINI, $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,$attributes=NULL){
-		return $this->_fieldAs(function($id,$name,$value){
-			$img=new HtmlImage($id,$value);
+	public function fieldAsAvatar($index, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value) {
+			$img=new HtmlImage($id, $value);
 			$img->asAvatar();
 			return $img;
-		}, $index,$attributes,"avatar");
+		}, $index, $attributes, "avatar");
 	}
 
-	public function fieldAsRadio($index,$attributes=NULL){
-		return $this->_fieldAs(function($id,$name,$value){
-			$input= new HtmlRadio($id,$name,$value,$value);
+	public function fieldAsRadio($index, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value) {
+			$input=new HtmlRadio($id, $name, $value, $value);
 			return $input;
-		}, $index,$attributes,"radio");
+		}, $index, $attributes, "radio");
 	}
 
-	public function fieldAsInput($index,$attributes=NULL){
-		return $this->_fieldAs(function($id,$name,$value){
-			$input= new HtmlFormInput($id,"","text",$value);
+	public function fieldAsInput($index, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value) {
+			$input=new HtmlFormInput($id, "", "text", $value);
 			$input->setName($name);
 			return $input;
-		}, $index,$attributes,"input");
+		}, $index, $attributes, "input");
 	}
 
-	public function fieldAsHidden($index,$attributes=NULL){
-		if(!\is_array($attributes)){
+	public function fieldAsHidden($index, $attributes=NULL) {
+		if (!\is_array($attributes)) {
 			$attributes=[];
 		}
 		$attributes["imputType"]="hidden";
-		return $this->fieldAsInput($index,$attributes);
+		return $this->fieldAsInput($index, $attributes);
 	}
 
-	public function fieldAsCheckbox($index,$attributes=NULL){
-		return $this->_fieldAs(function($id,$name,$value){
-			$input=new HtmlFormCheckbox($id,NULL,$this->_instanceViewer->getIdentifier());
+	public function fieldAsCheckbox($index, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value) {
+			$input=new HtmlFormCheckbox($id, NULL, $this->_instanceViewer->getIdentifier());
 			$input->setChecked(JString::isBooleanTrue($value));
 			$input->getField()->setProperty("name", $name);
 			return $input;
-		}, $index,$attributes,"ck");
+		}, $index, $attributes, "ck");
 	}
 
-	public function fieldAsDropDown($index,$elements=[],$multiple=false,$attributes=NULL){
-		return $this->_fieldAs(function($id,$name,$value) use($elements,$multiple){
+	public function fieldAsDropDown($index, $elements=[], $multiple=false, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value) use($elements, $multiple){
 			//$dd=new HtmlDropdown($id,$value,$elements);
-			$dd=new HtmlFormDropdown($id,$elements,NULL,$value);
-			$dd->asSelect($name,$multiple);
+			$dd=new HtmlFormDropdown($id, $elements, NULL, $value);
+			$dd->asSelect($name, $multiple);
 			return $dd;
-		}, $index,$attributes,"dd");
+		}, $index, $attributes, "dd");
 	}
 }
\ No newline at end of file

Braces +9 added lines, -5 removed lines

@@ -56,8 +56,9 @@ 
 				$name=$attributes["name"];
 			}
 			$element=$elementCallback($this->_getFieldIdentifier($prefix),$name,$value,"");
-			if(\is_array($attributes))
-				$this->_applyAttributes($element, $attributes,$index);
+			if(\is_array($attributes)) {
+							$this->_applyAttributes($element, $attributes,$index);
+			}
 			$element->setDisabled(!$this->_edition);
 			return $element;
 		});
@@ -92,8 +93,9 @@ 
 	public function fieldAsHeader($index,$niveau=1,$icon=NULL,$attributes=NULL){
 		return $this->_fieldAs(function($id,$name,$value) use($niveau,$icon){
 			$header=new HtmlHeader($id,$niveau,$value);
-			if(isset($icon))
-				$header->asIcon($icon, $value);
+			if(isset($icon)) {
+							$header->asIcon($icon, $value);
+			}
 			return $header;
 		}, $index,$attributes,"header");
 	}
@@ -101,7 +103,9 @@ 
 
 	public function fieldAsImage($index,$size=Size::MINI,$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;
 		});
 			return $this;

Ajax/bootstrap/html/base/HtmlNavElement.php

Spacing +11 added lines, -11 removed lines

@@ -19,8 +19,8 @@ 
 	protected $attr;
 
 
-	public function __construct($identifier,$tagName){
-		parent::__construct($identifier,$tagName);
+	public function __construct($identifier, $tagName) {
+		parent::__construct($identifier, $tagName);
 		$this->root="";
 		$this->attr="data-ajax";
 	}
@@ -31,11 +31,11 @@ 
 	 * @param string $targetSelector the target of the get
 	 * @return HtmlNavElement
 	 */
-	public function autoGetOnClick($targetSelector){
-		return $this->getOnClick($this->root, $targetSelector,array("attr"=>$this->attr));
+	public function autoGetOnClick($targetSelector) {
+		return $this->getOnClick($this->root, $targetSelector, array("attr"=>$this->attr));
 	}
 
-	public function contentAsString(){
+	public function contentAsString() {
 		return implode("", $this->content);
 	}
 
@@ -43,15 +43,15 @@ 
 	 * Generate the jquery script to set the elements to the HtmlNavElement
 	 * @param JsUtils $jsUtils
 	 */
-	public function jsSetContent(JsUtils $jsUtils){
-		$jsUtils->html("#".$this->identifier,str_replace("\"","'", $this->contentAsString()),true);
+	public function jsSetContent(JsUtils $jsUtils) {
+		$jsUtils->html("#".$this->identifier, str_replace("\"", "'", $this->contentAsString()), true);
 	}
 
 	public function getRoot() {
 		return $this->root;
 	}
 	public function setRoot($root) {
-		$this->root = $root;
+		$this->root=$root;
 		return $this;
 	}
 	public function getAttr() {
@@ -64,12 +64,12 @@ 
 	 * @return HtmlNavElement
 	 */
 	public function setAttr($attr) {
-		$this->attr = $attr;
+		$this->attr=$attr;
 		return $this;
 	}
 
 	public function __call($method, $args) {
-		if(isset($this->$method) && is_callable($this->$method)) {
+		if (isset($this->$method) && is_callable($this->$method)) {
 			return call_user_func_array(
 					$this->$method,
 					$args
@@ -77,6 +77,6 @@ 
 		}
 	}
 
-	abstract public function fromDispatcher(JsUtils $js,$dispatcher,$startIndex=0);
+	abstract public function fromDispatcher(JsUtils $js, $dispatcher, $startIndex=0);
 
 }
\ No newline at end of file

Ajax/semantic/widgets/datatable/DataTable.php

Spacing +78 added lines, -78 removed lines

@@ -30,8 +30,8 @@ 
 	protected $_hasCheckboxes;
 	protected $_compileParts;
 
-	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;}});
@@ -40,9 +40,9 @@ 
 		parent::run($js);
 	}
 
-	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);
 	}
 
 	/**
@@ -54,61 +54,61 @@ 
 	}
 
 
-	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){
+		if ($this->_hasCheckboxes) {
 			$this->_generateMainCheckbox($captions);
 		}
 
 		$table->setRowCount(0, \sizeof($captions));
 		$table->setHeaderValues($captions);
-		if(isset($this->_compileParts))
+		if (isset($this->_compileParts))
 			$table->setCompileParts($this->_compileParts);
-		if(isset($this->_searchField) && isset($js)){
-			$this->_searchField->postOn("change", $this->_urls,"{'s':$(this).val()}","-#".$this->identifier." tbody",["preventDefault"=>false]);
+		if (isset($this->_searchField) && isset($js)) {
+			$this->_searchField->postOn("change", $this->_urls, "{'s':$(this).val()}", "-#".$this->identifier." tbody", ["preventDefault"=>false]);
 		}
 
 		$this->_generateContent($table);
 
-		if($this->_hasCheckboxes && $table->hasPart("thead")){
-				$table->getHeader()->getCell(0, 0)->addToProperty("class","no-sort");
+		if ($this->_hasCheckboxes && $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 _generateMainCheckbox(&$captions){
-		$ck=new HtmlCheckbox("main-ck-".$this->identifier,"");
+	private function _generateMainCheckbox(&$captions) {
+		$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);
 	}
 
-	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);
-		$table->fromDatabaseObjects($objects, function($instance){
+		$table->fromDatabaseObjects($objects, function($instance) {
 			$this->_instanceViewer->setInstance($instance);
 			InstanceViewer::$index++;
-			$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);
 			}
@@ -116,28 +116,28 @@ 
 		});
 	}
 
-	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]);
 	}
 
-	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;
 		}
 	}
@@ -149,18 +149,18 @@ 
 	 * @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]);
 	}
 
-	public function getHtmlComponent(){
+	public function getHtmlComponent() {
 		return $this->content["table"];
 	}
 
@@ -173,8 +173,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() {
@@ -186,7 +186,7 @@ 
 		return $this;
 	}
 
-	public function refresh($compileParts=["tbody"]){
+	public function refresh($compileParts=["tbody"]) {
 		$this->_compileParts=$compileParts;
 		return $this;
 	}
@@ -195,8 +195,8 @@ 
 	 * @param callable $callback
 	 * @return callable
 	 */
-	private function getFieldButtonCallable($caption,$callback=null){
-		return $this->getCallable("getFieldButton",[$caption],$callback);
+	private function getFieldButtonCallable($caption, $callback=null) {
+		return $this->getCallable("getFieldButton", [$caption], $callback);
 	}
 
 	/**
@@ -205,16 +205,16 @@ 
 	 * @param callable $callback
 	 * @return callable
 	 */
-	private function getCallable($thisCallback,$parameters,$callback=null){
-		$result=function($instance) use($thisCallback,$parameters,$callback){
-			$object=call_user_func_array(array($this,$thisCallback), $parameters);
-			if(isset($callback)){
-				if(\is_callable($callback)){
-					$callback($object,$instance);
+	private function getCallable($thisCallback, $parameters, $callback=null) {
+		$result=function($instance) use($thisCallback, $parameters, $callback){
+			$object=call_user_func_array(array($this, $thisCallback), $parameters);
+			if (isset($callback)) {
+				if (\is_callable($callback)) {
+					$callback($object, $instance);
 				}
 			}
-			if($object instanceof HtmlSemDoubleElement){
-				$object->setProperty("data-ajax",$this->_instanceViewer->getIdentifier());
+			if ($object instanceof HtmlSemDoubleElement) {
+				$object->setProperty("data-ajax", $this->_instanceViewer->getIdentifier());
 			}
 			return $object;
 		};
@@ -225,8 +225,8 @@ 
 	 * @param string $caption
 	 * @return HtmlButton
 	 */
-	private function getFieldButton($caption){
-		return new HtmlButton("",$caption);
+	private function getFieldButton($caption) {
+		return new HtmlButton("", $caption);
 	}
 
 	/**
@@ -235,8 +235,8 @@ 
 	 * @param callable $callback
 	 * @return \Ajax\semantic\widgets\datatable\DataTable
 	 */
-	public function addFieldButton($caption,$callback=null){
-		$this->addField($this->getCallable("getFieldButton",[$caption],$callback));
+	public function addFieldButton($caption, $callback=null) {
+		$this->addField($this->getCallable("getFieldButton", [$caption], $callback));
 		return $this;
 	}
 
@@ -247,8 +247,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;
 	}
 
@@ -259,60 +259,60 @@ 
 	 * @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){
-		$this->addField($this->getCallable("getDefaultButton",[$icon,$class],$callback));
+	private function addDefaultButton($icon, $class=null, $callback=null) {
+		$this->addField($this->getCallable("getDefaultButton", [$icon, $class], $callback));
 		return $this;
 	}
 
-	private function insertDefaultButtonIn($index,$icon,$class=null,$callback=null){
-		$this->insertInField($index,$this->getCallable("getDefaultButton",[$icon,$class],$callback));
+	private function insertDefaultButtonIn($index, $icon, $class=null, $callback=null) {
+		$this->insertInField($index, $this->getCallable("getDefaultButton", [$icon, $class], $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 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;
 	}

Ajax/semantic/html/collections/form/traits/FieldTrait.php

Spacing +19 added lines, -19 removed lines

@@ -16,7 +16,7 @@ 
 
 	abstract public function addToProperty($name, $value, $separator=" ");
 	abstract public function addLabel($caption, $style="label-default", $leftSeparator=" ");
-	abstract public function addContent($content,$before=false);
+	abstract public function addContent($content, $before=false);
 	abstract public function getField();
 	abstract public function getDataField();
 
@@ -25,7 +25,7 @@ 
 	}
 
 	public function addLoading() {
-		if ($this->_hasIcon === false) {
+		if ($this->_hasIcon===false) {
 			throw new \Exception("Input must have an icon for showing a loader, use addIcon before");
 		}
 		return $this->addToProperty("class", State::LOADING);
@@ -33,56 +33,56 @@ 
 
 	public function labeled($label, $direction=Direction::LEFT, $icon=NULL) {
 		$field=$this->getField();
-		$labelO=$field->addLabel($label,$direction===Direction::LEFT,$icon);
-		$field->addToProperty("class", $direction . " labeled");
+		$labelO=$field->addLabel($label, $direction===Direction::LEFT, $icon);
+		$field->addToProperty("class", $direction." labeled");
 		return $labelO;
 	}
 
 	public function labeledToCorner($icon, $direction=Direction::LEFT) {
-		return $this->labeled("", $direction . " corner", $icon)->toCorner($direction);
+		return $this->labeled("", $direction." corner", $icon)->toCorner($direction);
 	}
 
 	public function addAction($action, $direction=Direction::RIGHT, $icon=NULL, $labeled=false) {
 		$field=$this->getField();
 		$actionO=$action;
-		if (\is_object($action) === false) {
-			$actionO=new HtmlButton("action-" . $this->identifier, $action);
+		if (\is_object($action)===false) {
+			$actionO=new HtmlButton("action-".$this->identifier, $action);
 			if (isset($icon))
 				$actionO->addIcon($icon, true, $labeled);
 		}
-		$field->addToProperty("class", $direction . " action");
-		$field->addContent($actionO, \strstr($direction, Direction::LEFT) !== false);
+		$field->addToProperty("class", $direction." action");
+		$field->addContent($actionO, \strstr($direction, Direction::LEFT)!==false);
 		return $actionO;
 	}
 
-	public function addDropdown($label="", $items=array(),$direction=Direction::RIGHT){
-		$labelO=new HtmlDropdown("dd-".$this->identifier,$label,$items);
-		$labelO->asSelect("select-".$this->identifier,false,true);
-		return $this->labeled($labelO,$direction);
+	public function addDropdown($label="", $items=array(), $direction=Direction::RIGHT) {
+		$labelO=new HtmlDropdown("dd-".$this->identifier, $label, $items);
+		$labelO->asSelect("select-".$this->identifier, false, true);
+		return $this->labeled($labelO, $direction);
 	}
 
 	public function setTransparent() {
 		return $this->getField()->addToProperty("class", "transparent");
 	}
 
-	public function setReadonly(){
+	public function setReadonly() {
 		$this->getDataField()->setProperty("readonly", "");
 		return $this;
 	}
 
-	public function setName($name){
-		$this->getDataField()->setProperty("name",$name);
+	public function setName($name) {
+		$this->getDataField()->setProperty("name", $name);
 		return $this;
 	}
 
-	public function setFluid(){
-		$this->getField()->addToProperty("class","fluid");
+	public function setFluid() {
+		$this->getField()->addToProperty("class", "fluid");
 		return $this;
 	}
 
 	public function setDisabled($disable=true) {
 		$field=$this->getField();
-		if($disable)
+		if ($disable)
 			$field->addToProperty("class", "disabled");
 		return $this;
 	}

Braces +6 added lines, -4 removed lines

@@ -47,8 +47,9 @@ 
 		$actionO=$action;
 		if (\is_object($action) === false) {
 			$actionO=new HtmlButton("action-" . $this->identifier, $action);
-			if (isset($icon))
-				$actionO->addIcon($icon, true, $labeled);
+			if (isset($icon)) {
+							$actionO->addIcon($icon, true, $labeled);
+			}
 		}
 		$field->addToProperty("class", $direction . " action");
 		$field->addContent($actionO, \strstr($direction, Direction::LEFT) !== false);
@@ -82,8 +83,9 @@ 
 
 	public function setDisabled($disable=true) {
 		$field=$this->getField();
-		if($disable)
-			$field->addToProperty("class", "disabled");
+		if($disable) {
+					$field->addToProperty("class", "disabled");
+		}
 		return $this;
 	}
 }
\ No newline at end of file

Ajax/semantic/html/collections/form/traits/CheckboxTrait.php

Spacing +8 added lines, -8 removed lines

@@ -38,18 +38,18 @@ 
 		return $this->getHtmlCk()->attachEvents($events);
 	}
 
-	public function getField(){
+	public function getField() {
 		//TODO check getField() ?
 		return $this->content["field"];
 	}
 
-	public function getHtmlCk(){
+	public function getHtmlCk() {
 		return $this->content["field"];
 	}
 
-	public function getDataField(){
-		$field= $this->getField();
-		if($field instanceof AbstractCheckbox)
+	public function getDataField() {
+		$field=$this->getField();
+		if ($field instanceof AbstractCheckbox)
 			$field=$field->getField();
 		return $field;
 	}
@@ -59,10 +59,10 @@ 
 	 * @param boolean $value
 	 * @return HtmlFormField
 	 */
-	public function setChecked($value=true){
-		if($value===true){
+	public function setChecked($value=true) {
+		if ($value===true) {
 			$this->getDataField()->setProperty("checked", "checked");
-		}else{
+		} else {
 			$this->getDataField()->removeProperty("checked");
 		}
 		return $this;

Braces +4 added lines, -3 removed lines

@@ -49,8 +49,9 @@ 
 
 	public function getDataField(){
 		$field= $this->getField();
-		if($field instanceof AbstractCheckbox)
-			$field=$field->getField();
+		if($field instanceof AbstractCheckbox) {
+					$field=$field->getField();
+		}
 		return $field;
 	}
 
@@ -62,7 +63,7 @@ 
 	public function setChecked($value=true){
 		if($value===true){
 			$this->getDataField()->setProperty("checked", "checked");
-		}else{
+		} else{
 			$this->getDataField()->removeProperty("checked");
 		}
 		return $this;

Ajax/semantic/html/collections/form/HtmlFormField.php

Spacing +36 added lines, -36 removed lines

@@ -14,34 +14,34 @@ 
 	use FieldTrait;
 	protected $_container;
 	protected $_validation;
-	public function __construct($identifier, $field,$label=NULL) {
-		parent::__construct($identifier, "div","field");
+	public function __construct($identifier, $field, $label=NULL) {
+		parent::__construct($identifier, "div", "field");
 		$this->content=array();
-		$this->_states=[State::ERROR,State::DISABLED];
-		if(isset($label))
+		$this->_states=[State::ERROR, State::DISABLED];
+		if (isset($label))
 			$this->setLabel($label);
 		$this->setField($field);
 		$this->_validation=NULL;
 	}
 
-	public function addPointingLabel($label,$pointing=Direction::NONE){
-		$labelO=new HtmlLabel("",$label);
+	public function addPointingLabel($label, $pointing=Direction::NONE) {
+		$labelO=new HtmlLabel("", $label);
 		$labelO->setPointing($pointing);
-		$this->addContent($labelO,$pointing==="below" || $pointing==="right");
+		$this->addContent($labelO, $pointing==="below" || $pointing==="right");
 		return $labelO;
 	}
 
-	public function setLabel($label){
+	public function setLabel($label) {
 		$labelO=$label;
-		if(\is_string($label)){
-			$labelO=new HtmlSemDoubleElement("","label","");
+		if (\is_string($label)) {
+			$labelO=new HtmlSemDoubleElement("", "label", "");
 			$labelO->setContent($label);
-			$labelO->setProperty("for", \str_replace("field-", "",$this->identifier));
+			$labelO->setProperty("for", \str_replace("field-", "", $this->identifier));
 		}
 		$this->content["label"]=$labelO;
 	}
 
-	public function setField($field){
+	public function setField($field) {
 		$this->content["field"]=$field;
 	}
 
@@ -49,8 +49,8 @@ 
 	 * Returns the label or null
 	 * @return mixed
 	 */
-	public function getLabel(){
-		if(\array_key_exists("label", $this->content))
+	public function getLabel() {
+		if (\array_key_exists("label", $this->content))
 			return $this->content["label"];
 	}
 
@@ -58,7 +58,7 @@ 
 	 * Return the field
 	 * @return mixed
 	 */
-	public function getField(){
+	public function getField() {
 		return $this->content["field"];
 	}
 
@@ -66,14 +66,14 @@ 
 	 * Return the field with data
 	 * @return mixed
 	 */
-	public function getDataField(){
+	public function getDataField() {
 		return $this->content["field"];
 	}
 
 	/**
 	 * puts the label before or behind
 	 */
-	public function swapLabel(){
+	public function swapLabel() {
 		$label=$this->getLabel();
 		unset($this->content["label"]);
 		$this->content["label"]=$label;
@@ -84,31 +84,31 @@ 
 	 * @param int $width
 	 * @return \Ajax\semantic\html\collections\form\HtmlFormField
 	 */
-	public function setWidth($width){
-		if(\is_int($width)){
+	public function setWidth($width) {
+		if (\is_int($width)) {
 			$width=Wide::getConstants()["W".$width];
 		}
 		$this->addToPropertyCtrl("class", $width, Wide::getConstants());
-		if(isset($this->_container)){
+		if (isset($this->_container)) {
 			$this->_container->setEqualWidth(false);
 		}
-		return $this->addToPropertyCtrl("class", "wide",array("wide"));
+		return $this->addToPropertyCtrl("class", "wide", array("wide"));
 	}
 
 	/**
 	 * Field displays an error state
 	 * @return \Ajax\semantic\html\collections\form\HtmlFormField
 	 */
-	public function setError(){
+	public function setError() {
 		return $this->addToProperty("class", "error");
 	}
 
-	public function setInline(){
+	public function setInline() {
 		return $this->addToProperty("class", "inline");
 	}
 
-	public function jsState($state){
-		return $this->jsDoJquery("addClass",$state);
+	public function jsState($state) {
+		return $this->jsDoJquery("addClass", $state);
 	}
 
 	public function setContainer($_container) {
@@ -116,34 +116,34 @@ 
 		return $this;
 	}
 
-	public function setReadonly(){
+	public function setReadonly() {
 		$this->getField()->setProperty("readonly", "");
 	}
 
-	public function addRule($type,$prompt=NULL,$value=NULL){
+	public function addRule($type, $prompt=NULL, $value=NULL) {
 		$field=$this->getDataField();
-		if(isset($field)){
-			if(!isset($this->_validation)){
+		if (isset($field)) {
+			if (!isset($this->_validation)) {
 				$this->_validation=new FieldValidation($field->getIdentifier());
 			}
-			if($type==="empty"){
-				$this->addToProperty("class","required");
+			if ($type==="empty") {
+				$this->addToProperty("class", "required");
 			}
-			$this->_validation->addRule($type,$prompt,$value);
+			$this->_validation->addRule($type, $prompt, $value);
 		}
 		return $this;
 	}
 
-	public function addRules(array $rules){
-		foreach ($rules as $rule){
+	public function addRules(array $rules) {
+		foreach ($rules as $rule) {
 			$this->addRule($rule);
 		}
 		return $this;
 	}
 
-	public function addIcon($icon,$direction=Direction::LEFT){
+	public function addIcon($icon, $direction=Direction::LEFT) {
 		$field=$this->getField();
-		return $field->addIcon($icon,$direction);
+		return $field->addIcon($icon, $direction);
 	}
 
 	public function getValidation() {

Braces +6 added lines, -4 removed lines

@@ -18,8 +18,9 @@ 
 		parent::__construct($identifier, "div","field");
 		$this->content=array();
 		$this->_states=[State::ERROR,State::DISABLED];
-		if(isset($label))
-			$this->setLabel($label);
+		if(isset($label)) {
+					$this->setLabel($label);
+		}
 		$this->setField($field);
 		$this->_validation=NULL;
 	}
@@ -50,8 +51,9 @@ 
 	 * @return mixed
 	 */
 	public function getLabel(){
-		if(\array_key_exists("label", $this->content))
-			return $this->content["label"];
+		if(\array_key_exists("label", $this->content)) {
+					return $this->content["label"];
+		}
 	}
 
 	/**

Ajax/semantic/html/collections/form/HtmlFormDropdown.php

Spacing +10 added lines, -10 removed lines

@@ -7,25 +7,25 @@
 
 class HtmlFormDropdown extends HtmlFormField {
 
-	public function __construct($identifier,$items=array(), $label=NULL,$value=NULL,$multiple=false,$associative=true) {
-		parent::__construct("field-".$identifier, (new HtmlDropdown("dropdown-".$identifier,$value,$items,$associative))->asSelect($identifier,$multiple), $label);
+	public function __construct($identifier, $items=array(), $label=NULL, $value=NULL, $multiple=false, $associative=true) {
+		parent::__construct("field-".$identifier, (new HtmlDropdown("dropdown-".$identifier, $value, $items, $associative))->asSelect($identifier, $multiple), $label);
 	}
 
-	public function setItems($items){
+	public function setItems($items) {
 		return $this->getField()->setItems($items);
 	}
-	public function addItem($item,$value=NULL,$image=NULL){
-		return $this->getField()->addItem($item,$value,$image);
+	public function addItem($item, $value=NULL, $image=NULL) {
+		return $this->getField()->addItem($item, $value, $image);
 	}
-	public static function multipleDropdown($identifier,$items=array(), $label=NULL,$value=NULL,$associative=true){
-		return new HtmlFormDropdown($identifier,$items,$label,$value,true,$associative);
+	public static function multipleDropdown($identifier, $items=array(), $label=NULL, $value=NULL, $associative=true) {
+		return new HtmlFormDropdown($identifier, $items, $label, $value, true, $associative);
 	}
 
-	public function getDataField(){
+	public function getDataField() {
 		return $this->getField()->getInput();
 	}
-	public function asSelect($name=NULL,$multiple=false,$selection=true){
-		$this->getField()->asSelect($name,$multiple,$selection);
+	public function asSelect($name=NULL, $multiple=false, $selection=true) {
+		$this->getField()->asSelect($name, $multiple, $selection);
 		return $this;
 	}
 }
\ No newline at end of file

Ajax/semantic/html/base/traits/BaseTrait.php

Spacing +14 added lines, -14 removed lines

@@ -12,8 +12,8 @@ 
  * @property string $identifier
  */
 trait BaseTrait {
-	protected $_variations=[ ];
-	protected $_states=[ ];
+	protected $_variations=[];
+	protected $_states=[];
 	protected $_baseClass;
 
 	abstract protected function setPropertyCtrl($name, $value, $typeCtrl);
@@ -26,7 +26,7 @@ 
 
 	abstract public function setProperty($name, $value);
 
-	abstract public function addContent($content,$before=false);
+	abstract public function addContent($content, $before=false);
 
 	abstract public function onCreate($jsCode);
 
@@ -47,7 +47,7 @@ 
 		$this->setProperty("class", $this->_baseClass);
 		if (\is_string($variations))
 			$variations=\explode(" ", $variations);
-		foreach ( $variations as $variation ) {
+		foreach ($variations as $variation) {
 			$this->addVariation($variation);
 		}
 		return $this;
@@ -61,7 +61,7 @@ 
 	public function addVariations($variations=array()) {
 		if (\is_string($variations))
 			$variations=\explode(" ", $variations);
-		foreach ( $variations as $variation ) {
+		foreach ($variations as $variation) {
 			$this->addVariation($variation);
 		}
 		return $this;
@@ -70,7 +70,7 @@ 
 	public function addStates($states=array()) {
 		if (\is_string($states))
 			$states=\explode(" ", $states);
-		foreach ( $states as $state ) {
+		foreach ($states as $state) {
 			$this->addState($state);
 		}
 		return $this;
@@ -80,17 +80,17 @@ 
 		$this->setProperty("class", $this->_baseClass);
 		if (\is_string($states))
 			$states=\explode(" ", $states);
-		foreach ( $states as $state ) {
+		foreach ($states as $state) {
 			$this->addState($state);
 		}
 		return $this;
 	}
 
 	public function addIcon($icon, $before=true) {
-		return $this->addContent(new HtmlIcon("icon-" . $this->identifier, $icon), $before);
+		return $this->addContent(new HtmlIcon("icon-".$this->identifier, $icon), $before);
 	}
 
-	public function addSticky($context="body"){
+	public function addSticky($context="body") {
 		$this->onCreate("$('#".$this->identifier."').sticky({ context: '".$context."'});");
 		return $this;
 	}
@@ -111,7 +111,7 @@ 
 	 * @return \Ajax\semantic\html\elements\HtmlSemDoubleElement
 	 */
 	public function setDisabled($disable=true) {
-		if($disable)
+		if ($disable)
 			$this->addToProperty("class", "disabled");
 		return $this;
 	}
@@ -137,7 +137,7 @@ 
 	 *
 	 * @return \Ajax\semantic\html\base\HtmlSemDoubleElement
 	 */
-	public function asHeader(){
+	public function asHeader() {
 		return $this->addToProperty("class", "header");
 	}
 
@@ -145,8 +145,8 @@ 
 	 * show it is currently the active user selection
 	 * @return \Ajax\semantic\html\base\HtmlSemDoubleElement
 	 */
-	public function setActive($value=true){
-		if($value)
+	public function setActive($value=true) {
+		if ($value)
 			$this->addToProperty("class", "active");
 		return $this;
 	}
@@ -163,7 +163,7 @@ 
 	}
 
 	public function setFloated($direction="right") {
-		return $this->addToPropertyCtrl("class", $direction . " floated", Direction::getConstantValues("floated"));
+		return $this->addToPropertyCtrl("class", $direction." floated", Direction::getConstantValues("floated"));
 	}
 
 	public function floatRight() {

Braces +18 added lines, -12 removed lines

@@ -45,8 +45,9 @@ 
 
 	public function setVariations($variations) {
 		$this->setProperty("class", $this->_baseClass);
-		if (\is_string($variations))
-			$variations=\explode(" ", $variations);
+		if (\is_string($variations)) {
+					$variations=\explode(" ", $variations);
+		}
 		foreach ( $variations as $variation ) {
 			$this->addVariation($variation);
 		}
@@ -59,8 +60,9 @@ 
 	}
 
 	public function addVariations($variations=array()) {
-		if (\is_string($variations))
-			$variations=\explode(" ", $variations);
+		if (\is_string($variations)) {
+					$variations=\explode(" ", $variations);
+		}
 		foreach ( $variations as $variation ) {
 			$this->addVariation($variation);
 		}
@@ -68,8 +70,9 @@ 
 	}
 
 	public function addStates($states=array()) {
-		if (\is_string($states))
-			$states=\explode(" ", $states);
+		if (\is_string($states)) {
+					$states=\explode(" ", $states);
+		}
 		foreach ( $states as $state ) {
 			$this->addState($state);
 		}
@@ -78,8 +81,9 @@ 
 
 	public function setStates($states) {
 		$this->setProperty("class", $this->_baseClass);
-		if (\is_string($states))
-			$states=\explode(" ", $states);
+		if (\is_string($states)) {
+					$states=\explode(" ", $states);
+		}
 		foreach ( $states as $state ) {
 			$this->addState($state);
 		}
@@ -111,8 +115,9 @@ 
 	 * @return \Ajax\semantic\html\elements\HtmlSemDoubleElement
 	 */
 	public function setDisabled($disable=true) {
-		if($disable)
-			$this->addToProperty("class", "disabled");
+		if($disable) {
+					$this->addToProperty("class", "disabled");
+		}
 		return $this;
 	}
 
@@ -146,8 +151,9 @@ 
 	 * @return \Ajax\semantic\html\base\HtmlSemDoubleElement
 	 */
 	public function setActive($value=true){
-		if($value)
-			$this->addToProperty("class", "active");
+		if($value) {
+					$this->addToProperty("class", "active");
+		}
 		return $this;
 	}
 

Ajax/common/Widget.php

Spacing +46 added lines, -46 removed lines

@@ -37,28 +37,28 @@ 
 	protected $_edition;
 
 
-	public function __construct($identifier,$model,$modelInstance=NULL) {
+	public function __construct($identifier, $model, $modelInstance=NULL) {
 		parent::__construct($identifier);
 		$this->_template="%wrapContentBefore%%content%%wrapContentAfter%";
 		$this->setModel($model);
-		if(isset($modelInstance));
+		if (isset($modelInstance));
 			$this->show($modelInstance);
 	}
 
-	protected function _init($instanceViewer,$contentKey,$content,$edition){
+	protected function _init($instanceViewer, $contentKey, $content, $edition) {
 		$this->_instanceViewer=$instanceViewer;
 		$this->content=[$contentKey=>$content];
 		$this->_toolbarPosition=PositionInTable::BEFORETABLE;
 		$this->_edition=$edition;
 	}
 
-	protected function _getFieldIdentifier($prefix){
+	protected function _getFieldIdentifier($prefix) {
 		return $this->identifier."-{$prefix}-".$this->_instanceViewer->getIdentifier();
 	}
 
-	abstract protected  function _setToolbarPosition($table,$captions=NULL);
+	abstract protected  function _setToolbarPosition($table, $captions=NULL);
 
-	public function show($modelInstance){
+	public function show($modelInstance) {
 		$this->_modelInstance=$modelInstance;
 	}
 
@@ -82,42 +82,42 @@ 
 
 	abstract public function getHtmlComponent();
 
-	public function setColor($color){
+	public function setColor($color) {
 		return $this->getHtmlComponent()->setColor($color);
 	}
 
 
-	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;
 	}
@@ -125,8 +125,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();
 		}
@@ -139,10 +139,10 @@ 
 	 * @param callable $callback function to call on $element
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
-	public function addInToolbar($element,$callback=NULL){
+	public function addInToolbar($element, $callback=NULL) {
 		$tb=$this->getToolbar();
-		if(isset($callback)){
-			if(\is_callable($callback)){
+		if (isset($callback)) {
+			if (\is_callable($callback)) {
 				$callback($element);
 			}
 		}
@@ -155,9 +155,9 @@ 
 	 * @param callable $callback function($element)
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
-	public function addItemInToolbar($caption,$icon=NULL,$callback=NULL){
-		$result=$this->addInToolbar($caption,$callback);
-		if(isset($icon))
+	public function addItemInToolbar($caption, $icon=NULL, $callback=NULL) {
+		$result=$this->addInToolbar($caption, $callback);
+		if (isset($icon))
 			$result->addIcon($icon);
 		return $result;
 	}
@@ -167,14 +167,14 @@ 
 	 * @param callable $callback function($element)
 	 * @return \Ajax\common\Widget
 	 */
-	public function addItemsInToolbar(array $items,$callback=NULL){
-		if(JArray::isAssociative($items)){
-			foreach ($items as $icon=>$item){
-				$this->addItemInToolbar($item,$icon,$callback);
+	public function addItemsInToolbar(array $items, $callback=NULL) {
+		if (JArray::isAssociative($items)) {
+			foreach ($items as $icon=>$item) {
+				$this->addItemInToolbar($item, $icon, $callback);
 			}
-		}else{
-			foreach ($items as $item){
-				$this->addItemInToolbar($item,null,$callback);
+		} else {
+			foreach ($items as $item) {
+				$this->addItemInToolbar($item, null, $callback);
 			}
 		}
 		return $this;
@@ -186,12 +186,12 @@ 
 	 * @param callable $callback function($element)
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
-	public function addDropdownInToolbar($value,$items,$callback=NULL){
+	public function addDropdownInToolbar($value, $items, $callback=NULL) {
 		$dd=$value;
 		if (\is_string($value)) {
-			$dd=new HtmlDropdown("dropdown-". $this->identifier."-".$value, $value, $items);
+			$dd=new HtmlDropdown("dropdown-".$this->identifier."-".$value, $value, $items);
 		}
-		return $this->addInToolbar($dd,$callback);
+		return $this->addInToolbar($dd, $callback);
 	}
 
 	/**
@@ -199,9 +199,9 @@ 
 	 * @param callable $callback function($element)
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
-	public function addButtonInToolbar($caption,$callback=NULL){
-		$bt=new HtmlButton("",$caption);
-		return $this->addInToolbar($bt,$callback);
+	public function addButtonInToolbar($caption, $callback=NULL) {
+		$bt=new HtmlButton("", $caption);
+		return $this->addInToolbar($bt, $callback);
 	}
 
 	/**
@@ -210,9 +210,9 @@ 
 	 * @param callable $callback function($element)
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
-	public function addButtonsInToolbar(array $captions,$asIcon=false,$callback=NULL){
-		$bts=new HtmlButtonGroups("",$captions,$asIcon);
-		return $this->addInToolbar($bts,$callback);
+	public function addButtonsInToolbar(array $captions, $asIcon=false, $callback=NULL) {
+		$bts=new HtmlButtonGroups("", $captions, $asIcon);
+		return $this->addInToolbar($bts, $callback);
 	}
 
 	/**
@@ -222,9 +222,9 @@ 
 	 * @param boolean $labeled
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
-	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);
 	}
 
@@ -254,7 +254,7 @@ 
 	 * @param callable $defaultValueFunction
 	 * @return \Ajax\common\Widget
 	 */
-	public function setDefaultValueFunction($defaultValueFunction){
+	public function setDefaultValueFunction($defaultValueFunction) {
 		$this->_instanceViewer->setDefaultValueFunction($defaultValueFunction);
 		return $this;
 	}
@@ -263,7 +263,7 @@ 
 	 * @param string|boolean $disable
 	 * @return string
 	 */
-	public function jsDisabled($disable=true){
+	public function jsDisabled($disable=true) {
 		return "$('#".$this->identifier." .ui.input,#".$this->identifier." .ui.dropdown,#".$this->identifier." .ui.checkbox').toggleClass('disabled',".$disable.");";
 	}
 
@@ -272,12 +272,12 @@ 
 	 * @param callable $callback function($element)
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
-	public function addEditButtonInToolbar($caption,$callback=NULL){
-		$bt=new HtmlButton($this->identifier."-editBtn",$caption);
+	public function addEditButtonInToolbar($caption, $callback=NULL) {
+		$bt=new HtmlButton($this->identifier."-editBtn", $caption);
 		$bt->setToggle();
 		$bt->setActive($this->_edition);
 		$bt->onClick($this->jsDisabled(Javascript::prep_value("!$(event.target).hasClass('active')")));
-		return $this->addInToolbar($bt,$callback);
+		return $this->addInToolbar($bt, $callback);
 	}
 
 }
\ No newline at end of file

Braces +4 added lines, -3 removed lines

@@ -157,8 +157,9 @@ 
 	 */
 	public function addItemInToolbar($caption,$icon=NULL,$callback=NULL){
 		$result=$this->addInToolbar($caption,$callback);
-		if(isset($icon))
-			$result->addIcon($icon);
+		if(isset($icon)) {
+					$result->addIcon($icon);
+		}
 		return $result;
 	}
 
@@ -172,7 +173,7 @@ 
 			foreach ($items as $icon=>$item){
 				$this->addItemInToolbar($item,$icon,$callback);
 			}
-		}else{
+		} else{
 			foreach ($items as $item){
 				$this->addItemInToolbar($item,null,$callback);
 			}