phpMv / phpMv-UI

Ajax/semantic/widgets/base/FieldAsTrait.php

Braces +14 added lines, -11 removed lines

@@ -57,8 +57,7 @@ 
 			$rules=$attributes["rules"];
 			if(\is_array($rules)){
 				$element->addRules($rules);
-			}
-			else{
+			} else{
 				$element->addRule($rules);
 			}
 			unset($attributes["rules"]);
@@ -118,8 +117,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");
 	}
@@ -127,7 +127,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;
@@ -209,12 +211,13 @@ 
 		$i=0;
 		if(JArray::isAssociative($types)){
 			foreach ($types as $type=>$attributes){
-				if(\is_int($type))
-					$this->fieldAs($i++,$attributes,[]);
-				else
-					$this->fieldAs($i++,$type,$attributes);
+				if(\is_int($type)) {
+									$this->fieldAs($i++,$attributes,[]);
+				} else {
+									$this->fieldAs($i++,$type,$attributes);
+				}
 			}
-		}else{
+		} else{
 			foreach ($types as $type){
 				$this->fieldAs($i++,$type);
 			}
@@ -226,7 +229,7 @@ 
 		if(\method_exists($this, $method)){
 			if(!\is_array($attributes)){
 				$attributes=[$index];
-			}else{
+			} else{
 				\array_unshift($attributes, $index);
 			}
 			\call_user_func_array([$this,$method], $attributes);

Doc Comments +19 added lines

@@ -26,9 +26,18 @@ 
 trait FieldAsTrait{
 
 	abstract protected function _getFieldIdentifier($prefix,$name="");
+
+	/**
+	 * @param \Closure $callback
+	 */
 	abstract public function setValueFunction($index,$callback);
 	abstract protected function _getFieldName($index);
 	abstract protected function _getFieldCaption($index);
+
+	/**
+	 * @param HtmlButton $button
+	 * @param string $event
+	 */
 	abstract protected function _buttonAsSubmit(&$button,$event,$url,$responseElement=NULL,$parameters=NULL);
 
 	/**
@@ -67,12 +76,19 @@ 
 		}
 	}
 
+	/**
+	 * @param HtmlFormInput $field
+	 */
 	protected function _prepareFormFields(&$field,$name,&$attributes){
 		$field->setName($name);
 		$this->_addRules($field, $attributes);
 		return $field;
 	}
 
+	/**
+	 * @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){
 			$caption=$this->_getFieldCaption($index);
@@ -223,6 +239,9 @@ 
 		}
 	}
 
+	/**
+	 * @param integer $index
+	 */
 	public function fieldAs($index,$type,$attributes=NULL){
 		$method="fieldAs".\ucfirst($type);
 		if(\method_exists($this, $method)){

Spacing +94 added lines, -94 removed lines

@@ -23,23 +23,23 @@ 
  * @property boolean $_edition
  * @property mixed _modelInstance
  */
-trait FieldAsTrait{
+trait FieldAsTrait {
 
-	abstract protected function _getFieldIdentifier($prefix,$name="");
-	abstract public function setValueFunction($index,$callback);
+	abstract protected function _getFieldIdentifier($prefix, $name="");
+	abstract public function setValueFunction($index, $callback);
 	abstract protected function _getFieldName($index);
 	abstract protected function _getFieldCaption($index);
-	abstract protected function _buttonAsSubmit(&$button,$event,$url,$responseElement=NULL,$parameters=NULL);
+	abstract protected function _buttonAsSubmit(&$button, $event, $url, $responseElement=NULL, $parameters=NULL);
 
 	/**
 	 * @param HtmlFormField $element
 	 * @param array $attributes
 	 */
-	protected function _applyAttributes($element,&$attributes,$index){
-		if(isset($attributes["callback"])){
+	protected function _applyAttributes($element, &$attributes, $index) {
+		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"]);
 			}
 		}
@@ -49,42 +49,42 @@ 
 		$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){
-		if(isset($attributes["rules"])){
+	protected function _addRules($element, &$attributes) {
+		if (isset($attributes["rules"])) {
 			$rules=$attributes["rules"];
-			if(\is_array($rules)){
+			if (\is_array($rules)) {
 				$element->addRules($rules);
 			}
-			else{
+			else {
 				$element->addRule($rules);
 			}
 			unset($attributes["rules"]);
 		}
 	}
 
-	protected function _prepareFormFields(&$field,$name,&$attributes){
+	protected function _prepareFormFields(&$field, $name, &$attributes) {
 		$field->setName($name);
 		$this->_addRules($field, $attributes);
 		return $field;
 	}
 
-	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){
 			$caption=$this->_getFieldCaption($index);
 			$name=$this->_getFieldName($index);
-			$id=$this->_getFieldIdentifier($prefix,$name);
-			if(isset($attributes["name"])){
+			$id=$this->_getFieldIdentifier($prefix, $name);
+			if (isset($attributes["name"])) {
 				$name=$attributes["name"];
 				unset($attributes["name"]);
 			}
-			$element=$elementCallback($id,$name,$value,$caption);
-			if(\is_array($attributes)){
-				$this->_applyAttributes($element, $attributes,$index);
+			$element=$elementCallback($id, $name, $value, $caption);
+			if (\is_array($attributes)) {
+				$this->_applyAttributes($element, $attributes, $index);
 			}
 			$element->setDisabled(!$this->_edition);
 			return $element;
@@ -93,153 +93,153 @@ 
 	}
 
 
-	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 fieldAsRadios($index,$elements=[],$attributes=NULL){
-		return $this->_fieldAs(function($id,$name,$value,$caption) use ($elements){
-			return HtmlFormFields::radios($name,$elements,$caption,$value);
-		}, $index,$attributes,"radios");
+	public function fieldAsRadios($index, $elements=[], $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) use ($elements){
+			return HtmlFormFields::radios($name, $elements, $caption, $value);
+		}, $index, $attributes, "radios");
 	}
 
-	public function fieldAsInput($index,$attributes=NULL){
-		return $this->_fieldAs(function($id,$name,$value,$caption) use ($attributes){
-			$input= new HtmlFormInput($id,$caption,"text",$value);
+	public function fieldAsInput($index, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) use ($attributes){
+			$input=new HtmlFormInput($id, $caption, "text", $value);
 			return $this->_prepareFormFields($input, $name, $attributes);
-		}, $index,$attributes,"input");
+		}, $index, $attributes, "input");
 	}
 
-	public function fieldAsTextarea($index,$attributes=NULL){
-		return $this->_fieldAs(function($id,$name,$value){
-			$textarea=new HtmlFormTextarea($id,null,$value);
+	public function fieldAsTextarea($index, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value) {
+			$textarea=new HtmlFormTextarea($id, null, $value);
 			$textarea->setName($name);
 			return $textarea;
-		}, $index,$attributes,"textarea");
+		}, $index, $attributes, "textarea");
 	}
 
-	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->setName($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){
-			$dd=new HtmlFormDropdown($id,$elements,NULL,$value);
-			$dd->asSelect($name,$multiple);
+	public function fieldAsDropDown($index, $elements=[], $multiple=false, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value) use($elements, $multiple){
+			$dd=new HtmlFormDropdown($id, $elements, NULL, $value);
+			$dd->asSelect($name, $multiple);
 			return $dd;
-		}, $index,$attributes,"dd");
+		}, $index, $attributes, "dd");
 	}
 
-	public function fieldAsMessage($index,$attributes=NULL){
-		return $this->_fieldAs(function($id,$name,$value,$caption){
-			$mess= new HtmlMessage("message-".$id,$value);
+	public function fieldAsMessage($index, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) {
+			$mess=new HtmlMessage("message-".$id, $value);
 			$mess->addHeader($caption);
 			return $mess;
-		}, $index,$attributes,"message");
+		}, $index, $attributes, "message");
 	}
 
 	/**Change fields type
 	 * @param array $types an array or associative array $type=>$attribute
 	 */
-	public function fieldsAs(array $types){
+	public function fieldsAs(array $types) {
 		$i=0;
-		if(JArray::isAssociative($types)){
-			foreach ($types as $type=>$attributes){
-				if(\is_int($type))
-					$this->fieldAs($i++,$attributes,[]);
+		if (JArray::isAssociative($types)) {
+			foreach ($types as $type=>$attributes) {
+				if (\is_int($type))
+					$this->fieldAs($i++, $attributes, []);
 				else
-					$this->fieldAs($i++,$type,$attributes);
+					$this->fieldAs($i++, $type, $attributes);
 			}
-		}else{
-			foreach ($types as $type){
-				$this->fieldAs($i++,$type);
+		} else {
+			foreach ($types as $type) {
+				$this->fieldAs($i++, $type);
 			}
 		}
 	}
 
-	public function fieldAs($index,$type,$attributes=NULL){
+	public function fieldAs($index, $type, $attributes=NULL) {
 		$method="fieldAs".\ucfirst($type);
-		if(\method_exists($this, $method)){
-			if(!\is_array($attributes)){
+		if (\method_exists($this, $method)) {
+			if (!\is_array($attributes)) {
 				$attributes=[$index];
-			}else{
+			} else {
 				\array_unshift($attributes, $index);
 			}
-			\call_user_func_array([$this,$method], $attributes);
+			\call_user_func_array([$this, $method], $attributes);
 		}
 	}
 
-	public function fieldAsSubmit($index,$cssStyle=NULL,$url=NULL,$responseElement=NULL,$attributes=NULL){
-		return $this->_fieldAs(function($id,$name,$value,$caption) use ($url,$responseElement,$cssStyle,$attributes){
-			$button=new HtmlButton($id,$value,$cssStyle);
-			$this->_buttonAsSubmit($button,"click",$url,$responseElement,$attributes["ajax"]);
+	public function fieldAsSubmit($index, $cssStyle=NULL, $url=NULL, $responseElement=NULL, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) use ($url, $responseElement, $cssStyle, $attributes){
+			$button=new HtmlButton($id, $value, $cssStyle);
+			$this->_buttonAsSubmit($button, "click", $url, $responseElement, $attributes["ajax"]);
 			return $button;
-		}, $index,$attributes,"submit");
+		}, $index, $attributes, "submit");
 	}
 }
\ No newline at end of file

Ajax/semantic/widgets/dataelement/DataElement.php

Spacing +14 added lines, -14 removed lines

@@ -19,45 +19,45 @@ 
 class DataElement extends Widget {
 
 	public function __construct($identifier, $modelInstance=NULL) {
-		parent::__construct($identifier, null,$modelInstance);
-		$this->_init(new InstanceViewer($identifier), "table", new HtmlTable($identifier, 0,2), false);
+		parent::__construct($identifier, null, $modelInstance);
+		$this->_init(new InstanceViewer($identifier), "table", new HtmlTable($identifier, 0, 2), false);
 		$this->content["table"]->setDefinition();
 	}
 
-	public function compile(JsUtils $js=NULL,&$view=NULL){
-		if(!$this->_generated){
+	public function compile(JsUtils $js=NULL, &$view=NULL) {
+		if (!$this->_generated) {
 			$this->_instanceViewer->setInstance($this->_modelInstance);
 
 			$table=$this->content["table"];
 			$this->_generateContent($table);
 
-			if(isset($this->_toolbar)){
+			if (isset($this->_toolbar)) {
 				$this->_setToolbarPosition($table);
 			}
-			$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->_generated=true;
 		}
-		return parent::compile($js,$view);
+		return parent::compile($js, $view);
 	}
 
 	/**
 	 * @param HtmlTable $table
 	 */
-	protected function _generateContent($table){
+	protected function _generateContent($table) {
 		$captions=$this->_instanceViewer->getCaptions();
-		$values= $this->_instanceViewer->getValues();
+		$values=$this->_instanceViewer->getValues();
 		$count=$this->_instanceViewer->count();
-		for($i=0;$i<$count;$i++){
-			$table->addRow([$captions[$i],$values[$i]]);
+		for ($i=0; $i<$count; $i++) {
+			$table->addRow([$captions[$i], $values[$i]]);
 		}
 	}
 
-	protected function _getFieldName($index){
+	protected function _getFieldName($index) {
 		return $this->_instanceViewer->getFieldName($index);
 	}
 
-	protected function _getFieldCaption($index){
+	protected function _getFieldCaption($index) {
 		return null;
 	}
 
@@ -89,7 +89,7 @@ 
 		return $this;
 	}
 
-	public function asForm(){
+	public function asForm() {
 		return $this->getForm();
 	}
 }
\ No newline at end of file

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

Spacing +1 added lines, -1 removed lines

@@ -16,6 +16,6 @@
 		if (isset($toElement)) {
 			$toElement->setAttached(true);
 		}
-		return $this->addToPropertyCtrl("class", $side . " attached", Side::getConstantValues("attached"));
+		return $this->addToPropertyCtrl("class", $side." attached", Side::getConstantValues("attached"));
 	}
 }
\ No newline at end of file

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

Spacing +17 added lines, -17 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,15 +145,15 @@ 
 	 * 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;
 	}
 
-	public function setAttached($value=true){
-		if($value)
-			$this->addToPropertyCtrl("class", "attached", array ("attached" ));
+	public function setAttached($value=true) {
+		if ($value)
+			$this->addToPropertyCtrl("class", "attached", array("attached"));
 		return $this;
 	}
 
@@ -169,7 +169,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 +21 added lines, -14 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,14 +151,16 @@ 
 	 * @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;
 	}
 
 	public function setAttached($value=true){
-		if($value)
-			$this->addToPropertyCtrl("class", "attached", array ("attached" ));
+		if($value) {
+					$this->addToPropertyCtrl("class", "attached", array ("attached" ));
+		}
 		return $this;
 	}
 

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

Braces +6 added lines, -4 removed lines

@@ -42,8 +42,9 @@ 
 
 	public function setAttached($value=true){
 		$form=$this->getForm();
-		if($value)
-			$form->addToPropertyCtrl("class", "attached", array ("attached" ));
+		if($value) {
+					$form->addToPropertyCtrl("class", "attached", array ("attached" ));
+		}
 		return $form;
 	}
 
@@ -85,8 +86,9 @@ 
 		if(isset($url) && isset($responseElement)){
 			$button->addEvent($event, "$('#".$form->getIdentifier()."').form('validate form');");
 			$params=["form"=>$form->getIdentifier(),"responseElement"=>$responseElement,"url"=>$url];
-			if(\is_array($parameters))
-				$params=\array_merge($params,$parameters);
+			if(\is_array($parameters)) {
+							$params=\array_merge($params,$parameters);
+			}
 			$form->addValidationParam("_ajaxSubmit", new AjaxCall("postForm", $params));
 		}
 		return $button;

Spacing +26 added lines, -26 removed lines

@@ -6,28 +6,28 @@ 
 use Ajax\service\AjaxCall;
 use Ajax\JsUtils;
 
-trait FormTrait{
+trait FormTrait {
 
 	/**
 	 * @return HtmlForm
 	 */
 	abstract protected function getForm();
 
-	protected function addCompoValidation($compo,$field){
+	protected function addCompoValidation($compo, $field) {
 		$validation=$field->getValidation();
-		if(isset($validation)){
+		if (isset($validation)) {
 			$validation->setIdentifier($field->getDataField()->getIdentifier());
 			$compo->addFieldValidation($validation);
 		}
 		return $compo;
 	}
 
-	protected function _runValidationParams(&$compo,JsUtils $js=NULL){
+	protected function _runValidationParams(&$compo, JsUtils $js=NULL) {
 		$form=$this->getForm();
 		$params=$form->getValidationParams();
-		if(isset($params["_ajaxSubmit"]) && $params["_ajaxSubmit"] instanceof AjaxCall){
+		if (isset($params["_ajaxSubmit"]) && $params["_ajaxSubmit"] instanceof AjaxCall) {
 			$compilation=$params["_ajaxSubmit"]->compile($js);
-			$compilation=str_ireplace("\"","%quote%", $compilation);
+			$compilation=str_ireplace("\"", "%quote%", $compilation);
 			$this->onSuccess($compilation);
 			$form->removeValidationParam("_ajaxSubmit");
 		}
@@ -40,14 +40,14 @@ 
 		return $this->getForm()->addToProperty("class", "loading");
 	}
 
-	public function setAttached($value=true){
+	public function setAttached($value=true) {
 		$form=$this->getForm();
-		if($value)
-			$form->addToPropertyCtrl("class", "attached", array ("attached" ));
+		if ($value)
+			$form->addToPropertyCtrl("class", "attached", array("attached"));
 		return $form;
 	}
 
-	public function addErrorMessage(){
+	public function addErrorMessage() {
 		return $this->getForm()->addContent((new HtmlMessage(""))->setError());
 	}
 
@@ -62,38 +62,38 @@ 
 	 * @param string $responseElement
 	 * @return \Ajax\semantic\html\collections\form\HtmlForm
 	 */
-	public function submitOn($event,$identifier,$url,$responseElement){
+	public function submitOn($event, $identifier, $url, $responseElement) {
 		$form=$this->getForm();
 		$elem=$form->getElementById($identifier, $form->getContent());
-		if(isset($elem)){
-			$this->_buttonAsSubmit($elem, $event,$url,$responseElement);
+		if (isset($elem)) {
+			$this->_buttonAsSubmit($elem, $event, $url, $responseElement);
 		}
 		return $form;
 	}
 
-	public function submitOnClick($identifier,$url,$responseElement){
+	public function submitOnClick($identifier, $url, $responseElement) {
 		return $this->submitOn("click", $identifier, $url, $responseElement);
 	}
 
-	public function addSubmit($identifier,$value,$cssStyle=NULL,$url=NULL,$responseElement=NULL){
-		$bt=$this->getForm()->addButton($identifier, $value,$cssStyle);
-		return $this->_buttonAsSubmit($bt, "click",$url,$responseElement);
+	public function addSubmit($identifier, $value, $cssStyle=NULL, $url=NULL, $responseElement=NULL) {
+		$bt=$this->getForm()->addButton($identifier, $value, $cssStyle);
+		return $this->_buttonAsSubmit($bt, "click", $url, $responseElement);
 	}
 
-	protected function _buttonAsSubmit(&$button,$event,$url,$responseElement=NULL,$parameters=NULL){
+	protected function _buttonAsSubmit(&$button, $event, $url, $responseElement=NULL, $parameters=NULL) {
 		$form=$this->getForm();
-		if(isset($url) && isset($responseElement)){
+		if (isset($url) && isset($responseElement)) {
 			$button->addEvent($event, "$('#".$form->getIdentifier()."').form('validate form');");
-			$params=["form"=>$form->getIdentifier(),"responseElement"=>$responseElement,"url"=>$url];
-			if(\is_array($parameters))
-				$params=\array_merge($params,$parameters);
+			$params=["form"=>$form->getIdentifier(), "responseElement"=>$responseElement, "url"=>$url];
+			if (\is_array($parameters))
+				$params=\array_merge($params, $parameters);
 			$form->addValidationParam("_ajaxSubmit", new AjaxCall("postForm", $params));
 		}
 		return $button;
 	}
 
-	public function addReset($identifier,$value,$cssStyle=NULL){
-		$bt=$this->getForm()->addButton($identifier, $value,$cssStyle);
+	public function addReset($identifier, $value, $cssStyle=NULL) {
+		$bt=$this->getForm()->addButton($identifier, $value, $cssStyle);
 		$bt->setProperty("type", "reset");
 		return $bt;
 	}
@@ -103,7 +103,7 @@ 
 	 * @param string $jsCode
 	 * @return \Ajax\semantic\html\collections\form\HtmlForm
 	 */
-	public function onValid($jsCode){
+	public function onValid($jsCode) {
 		$form=$this->getForm();
 		$form->addValidationParam("onValid", "%function(){".$jsCode."}%");
 		return $form;
@@ -114,7 +114,7 @@ 
 	 * @param string $jsCode can use event and fields parameters
 	 * @return HtmlForm
 	 */
-	public function onSuccess($jsCode){
+	public function onSuccess($jsCode) {
 		$form=$this->getForm();
 		$form->addValidationParam("onSuccess", "%function(event,fields){console.log(fields);".$jsCode."}%");
 		return $form;

Ajax/semantic/html/collections/table/traits/TableTrait.php

Spacing +6 added lines, -6 removed lines

@@ -1,13 +1,13 @@ 
 <?php
 namespace Ajax\semantic\html\collections\table\traits;
 
-trait TableTrait{
+trait TableTrait {
 	/**
 	 * @return HtmlTable
 	 */
 	abstract protected function getTable();
 
-	protected function addToPropertyTable($property,$value){
+	protected function addToPropertyTable($property, $value) {
 		return $this->getTable()->addToProperty($property, $value);
 	}
 
@@ -18,15 +18,15 @@ 
 	public function setBasic($very=false) {
 		$table=$this->getTable();
 		if ($very)
-			$table->addToPropertyCtrl("class", "very", array ("very" ));
-		return $table->addToPropertyCtrl("class", "basic", array ("basic" ));
+			$table->addToPropertyCtrl("class", "very", array("very"));
+		return $table->addToPropertyCtrl("class", "basic", array("basic"));
 	}
 
 	public function setCompact($very=false) {
 		$table=$this->getTable();
 		if ($very)
-			$table->addToPropertyCtrl("class", "very", array ("very" ));
-		return $table->addToPropertyCtrl("class", "compact", array ("compact" ));
+			$table->addToPropertyCtrl("class", "very", array("very"));
+		return $table->addToPropertyCtrl("class", "compact", array("compact"));
 	}
 
 	public function setCollapsing() {

Braces +6 added lines, -4 removed lines

@@ -17,15 +17,17 @@
 
 	public function setBasic($very=false) {
 		$table=$this->getTable();
-		if ($very)
-			$table->addToPropertyCtrl("class", "very", array ("very" ));
+		if ($very) {
+					$table->addToPropertyCtrl("class", "very", array ("very" ));
+		}
 		return $table->addToPropertyCtrl("class", "basic", array ("basic" ));
 	}
 
 	public function setCompact($very=false) {
 		$table=$this->getTable();
-		if ($very)
-			$table->addToPropertyCtrl("class", "very", array ("very" ));
+		if ($very) {
+					$table->addToPropertyCtrl("class", "very", array ("very" ));
+		}
 		return $table->addToPropertyCtrl("class", "compact", array ("compact" ));
 	}
 

Ajax/semantic/widgets/base/InstanceViewer.php

Spacing +81 added lines, -81 removed lines

@@ -17,183 +17,183 @@ 
 
 	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 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($index=NULL){
-		if(!isset($index))
+	public function getIdentifier($index=NULL) {
+		if (!isset($index))
 			$index=self::$index;
 		$value=$index;
-		if(isset($this->values["identifier"]))
-			$value=$this->values["identifier"]($index,$this->instance);
+		if (isset($this->values["identifier"]))
+			$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 _getValue($property,$index){
-		if($property instanceof \ReflectionProperty){
+	protected 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,$this->instance,$index);
-			}else{
-				$value=$this->_getDefaultValue($property->getName(),$value, $index);
+			if (isset($this->values[$index])) {
+				$value=$this->values[$index]($value, $this->instance, $index);
+			} else {
+				$value=$this->_getDefaultValue($property->getName(), $value, $index);
 			}
-		}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{
-				if(isset($this->values[$index])){
-					$value= $this->values[$index]($property,$this->instance,$index);
-				}elseif(isset($this->instance->{$property})){
+			} else {
+				if (isset($this->values[$index])) {
+					$value=$this->values[$index]($property, $this->instance, $index);
+				}elseif (isset($this->instance->{$property})) {
 					$value=$this->instance->{$property};
 				}
-				else{
+				else {
 					$value=null;
 				}
 			}
 		}
-		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);
 	}
 
-	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(\sizeof($this->visibleProperties)===0){
+		if (\sizeof($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;
 			}
 		}
@@ -205,12 +205,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;
 	}
@@ -223,41 +223,41 @@ 
 		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(){
-		if(isset($this->captions)){
-			$captions= $this->captions;
-			for($i=\sizeof($captions);$i<$this->count();$i++){
+	public function getCaptions() {
+		if (isset($this->captions)) {
+			$captions=$this->captions;
+			for ($i=\sizeof($captions); $i<$this->count(); $i++) {
 				$captions[]="";
 			}
-		}else{
+		} else {
 			$captions=[];
 			$index=0;
 			$count=$this->count();
-			while($index<$count){
+			while ($index<$count) {
 				$captions[]=$this->getCaption($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;
@@ -275,7 +275,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 +42 added lines, -37 removed lines

@@ -21,8 +21,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;};
@@ -39,11 +40,13 @@ 
 	}
 
 	public function getIdentifier($index=NULL){
-		if(!isset($index))
-			$index=self::$index;
+		if(!isset($index)) {
+					$index=self::$index;
+		}
 		$value=$index;
-		if(isset($this->values["identifier"]))
-			$value=$this->values["identifier"]($index,$this->instance);
+		if(isset($this->values["identifier"])) {
+					$value=$this->values["identifier"]($index,$this->instance);
+		}
 		return $value;
 	}
 
@@ -67,22 +70,21 @@ 
 			$value=$property->getValue($this->instance);
 			if(isset($this->values[$index])){
 				$value= $this->values[$index]($value,$this->instance,$index);
-			}else{
+			} else{
 				$value=$this->_getDefaultValue($property->getName(),$value, $index);
 			}
-		}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{
+			} else{
 				if(isset($this->values[$index])){
 					$value= $this->values[$index]($property,$this->instance,$index);
-				}elseif(isset($this->instance->{$property})){
+				} elseif(isset($this->instance->{$property})){
 					$value=$this->instance->{$property};
-				}
-				else{
+				} else{
 					$value=null;
 				}
 			}
@@ -105,10 +107,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;
@@ -135,9 +137,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;
@@ -157,7 +159,7 @@ 
 		$this->reflect=new \ReflectionClass($instance);
 		if(\sizeof($this->visibleProperties)===0){
 			$this->properties=$this->getDefaultProperties();
-		}else{
+		} else{
 			foreach ($this->visibleProperties as $property){
 				$this->setInstanceProperty($property);
 			}
@@ -168,22 +170,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;
 		}
 	}
@@ -227,12 +230,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(){
@@ -241,7 +245,7 @@ 
 			for($i=\sizeof($captions);$i<$this->count();$i++){
 				$captions[]="";
 			}
-		}else{
+		} else{
 			$captions=[];
 			$index=0;
 			$count=$this->count();
@@ -257,8 +261,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/service/Javascript.php

Spacing +2 added lines, -2 removed lines

@@ -6,8 +6,8 @@
 	public static $preventDefault="\nif(event && event.preventDefault) event.preventDefault();\n";
 	public static $stopPropagation="\nif(event && event.stopPropagation) event.stopPropagation();\n";
 
-	public static function containsCode($expression){
-		return strrpos($expression, 'this')!==false||strrpos($expression, 'event')!==false||strrpos($expression, 'self')!==false;
+	public static function containsCode($expression) {
+		return strrpos($expression, 'this')!==false || strrpos($expression, 'event')!==false || strrpos($expression, 'self')!==false;
 	}
 
 	/**

Ajax/semantic/widgets/datatable/DataTable.php

Doc Comments +23 added lines, -2 removed lines

@@ -37,6 +37,10 @@ 
 	protected $_targetSelector;
 	protected $_checkedMessage;
 
+	/**
+	 * @param string $identifier
+	 * @param string $model
+	 */
 	public function __construct($identifier,$model,$modelInstance=NULL) {
 		parent::__construct($identifier, $model,$modelInstance);
 		$this->_init(new InstanceViewer($identifier), "table", new HtmlTable($identifier, 0,0), false);
@@ -76,6 +80,9 @@ 
 				if(allChecked) {\$parentCheckbox.checkbox('set checked');}else if(allUnchecked){\$parentCheckbox.checkbox('set unchecked');}else{\$parentCheckbox.checkbox('set indeterminate');};".$checkedMessageCall);
 	}
 
+	/**
+	 * @param string $op
+	 */
 	protected function _generateBehavior($op,JsUtils $js){
 		if(isset($this->_urls[$op]))
 			$js->getOnClick("#".$this->identifier." .".$op, $this->_urls[$op],$this->getTargetSelector(),["preventDefault"=>false,"attr"=>"data-ajax"]);
@@ -211,6 +218,9 @@ 
 		return $this;
 	}
 
+	/**
+	 * @param PositionInTable $part
+	 */
 	private function addToolbarRow($part,$table,$captions){
 		$hasPart=$table->hasPart($part);
 		if($hasPart){
@@ -267,7 +277,7 @@ 
 	 * @param string $caption
 	 * @param callable $callback
 	 * @param boolean $visibleHover
-	 * @return callable
+	 * @return \Closure
 	 */
 	private function getFieldButtonCallable($caption,$visibleHover=true,$callback=null){
 		return $this->getCallable("getFieldButton",[$caption,$visibleHover],$callback);
@@ -277,7 +287,7 @@ 
 	 * @param callable $thisCallback
 	 * @param array $parameters
 	 * @param callable $callback
-	 * @return callable
+	 * @return \Closure
 	 */
 	private function getCallable($thisCallback,$parameters,$callback=null){
 		$result=function($instance) use($thisCallback,$parameters,$callback){
@@ -346,11 +356,19 @@ 
 		return $this;
 	}
 
+	/**
+	 * @param string $icon
+	 * @param string $class
+	 */
 	private function addDefaultButton($icon,$class=null,$visibleHover=true,$callback=null){
 		$this->addField($this->getCallable("getDefaultButton",[$icon,$class,$visibleHover],$callback));
 		return $this;
 	}
 
+	/**
+	 * @param string $icon
+	 * @param string $class
+	 */
 	private function insertDefaultButtonIn($index,$icon,$class=null,$visibleHover=true,$callback=null){
 		$this->insertInField($index,$this->getCallable("getDefaultButton",[$icon,$class,$visibleHover],$callback));
 		return $this;
@@ -437,6 +455,9 @@ 
 		}, $index,$attributes);
 	}
 
+	/**
+	 * @param HtmlButton $element
+	 */
 	protected function _visibleOver($element){
 		$this->_visibleHover=true;
 		return $element->addToProperty("class", "visibleover")->setProperty("style","visibility:hidden;");

Spacing +124 added lines, -124 removed lines

@@ -37,30 +37,30 @@ 
 	protected $_targetSelector;
 	protected $_checkedMessage;
 
-	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=[];
 	}
 
-	public function run(JsUtils $js){
-		if($this->_hasCheckboxes && isset($js)){
+	public function run(JsUtils $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($this->_hasDelete)
+		if ($this->_hasDelete)
 			$this->_generateBehavior("delete", $js);
-		if($this->_hasEdit)
+		if ($this->_hasEdit)
 			$this->_generateBehavior("edit", $js);
 		return parent::run($js);
 	}
 
-	protected function _runCheckboxes(JsUtils $js){
+	protected function _runCheckboxes(JsUtils $js) {
 		$checkedMessageCall="";
-		if($this->_hasCheckedMessage){
+		if ($this->_hasCheckedMessage) {
 			$msg=$this->getCheckedMessage();
 			$checkedMessageFunction="function updateChecked(){var msg='".$msg[0]."',count=\$('#{$this->identifier} [name=\"selection[]\"]:checked').length,all=\$('#{$this->identifier} [name=\"selection[]\"]').length;
 			if(count==1) msg='".$msg[1]."';
@@ -68,7 +68,7 @@ 
 						\$('#checked-count-".$this->identifier."').contents().filter(function() {return this.nodeType == 3;}).each(function(){this.textContent = msg.replace('{count}',count);});
 								\$('#toolbar-{$this->identifier} .visibleOnChecked').toggle(count>0);}\$('#toolbar-".$this->identifier." .visibleOnChecked').hide();";
 			$checkedMessageCall="updateChecked();";
-			$js->exec($checkedMessageFunction,true);
+			$js->exec($checkedMessageFunction, true);
 		}
 		$js->execOn("change", "#".$this->identifier." [name='selection[]']", "
 				var \$parentCheckbox=\$('#ck-main-ck-{$this->identifier}'),\$checkbox=\$('#{$this->identifier} [name=\"selection[]\"]'),allChecked=true,allUnchecked=true;
@@ -76,9 +76,9 @@ 
 				if(allChecked) {\$parentCheckbox.checkbox('set checked');}else if(allUnchecked){\$parentCheckbox.checkbox('set unchecked');}else{\$parentCheckbox.checkbox('set indeterminate');};".$checkedMessageCall);
 	}
 
-	protected function _generateBehavior($op,JsUtils $js){
-		if(isset($this->_urls[$op]))
-			$js->getOnClick("#".$this->identifier." .".$op, $this->_urls[$op],$this->getTargetSelector(),["preventDefault"=>false,"attr"=>"data-ajax"]);
+	protected function _generateBehavior($op, JsUtils $js) {
+		if (isset($this->_urls[$op]))
+			$js->getOnClick("#".$this->identifier." .".$op, $this->_urls[$op], $this->getTargetSelector(), ["preventDefault"=>false, "attr"=>"data-ajax"]);
 	}
 
 	/**
@@ -90,70 +90,70 @@ 
 	}
 
 
-	public function compile(JsUtils $js=NULL,&$view=NULL){
-		if(!$this->_generated){
+	public function compile(JsUtils $js=NULL, &$view=NULL) {
+		if (!$this->_generated) {
 			$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)){
-				if(isset($this->_urls["refresh"]))
-					$this->_searchField->postOn("change", $this->_urls["refresh"],"{'s':$(this).val()}","#".$this->identifier." tbody",["preventDefault"=>false,"jqueryDone"=>"replaceWith"]);
+			if (isset($this->_searchField) && isset($js)) {
+				if (isset($this->_urls["refresh"]))
+					$this->_searchField->postOn("change", $this->_urls["refresh"], "{'s':$(this).val()}", "#".$this->identifier." tbody", ["preventDefault"=>false, "jqueryDone"=>"replaceWith"]);
 			}
 
 			$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]);
+			$this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE, "table", PositionInTable::AFTERTABLE]);
 			$this->_compileForm();
 			$this->_generated=true;
 		}
-		return parent::compile($js,$view);
+		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, "");
 		$checkedMessageCall="";
-		if($this->_hasCheckedMessage)
+		if ($this->_hasCheckedMessage)
 			$checkedMessageCall="updateChecked();";
 		$ck->setOnChecked("$('#".$this->identifier." [name=%quote%selection[]%quote%]').prop('checked',true);".$checkedMessageCall);
 		$ck->setOnUnchecked("$('#".$this->identifier." [name=%quote%selection[]%quote%]').prop('checked',false);".$checkedMessageCall);
 		\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) use($table){
 			$this->_instanceViewer->setInstance($instance);
 			InstanceViewer::$index++;
-			$values= $this->_instanceViewer->getValues();
-			if($this->_hasCheckboxes){
-				$ck=new HtmlCheckbox("ck-".$this->identifier,"");
+			$values=$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($values, $ck);
 			}
@@ -164,37 +164,37 @@ 
 		});
 	}
 
-	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);
-		if(isset($this->_urls["refresh"]))
-			$menu->postOnClick($this->_urls["refresh"],"{'p':$(this).attr('data-page')}","#".$this->identifier." tbody",["preventDefault"=>false,"jqueryDone"=>"replaceWith"]);
+		if (isset($this->_urls["refresh"]))
+			$menu->postOnClick($this->_urls["refresh"], "{'p':$(this).attr('data-page')}", "#".$this->identifier." tbody", ["preventDefault"=>false, "jqueryDone"=>"replaceWith"]);
 	}
 
-	protected function _getFieldName($index){
+	protected function _getFieldName($index) {
 		return parent::_getFieldName($index)."[]";
 	}
 
-	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;
 		}
 	}
@@ -206,23 +206,23 @@ 
 	 * @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) {
 		$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();
 		$row->setValues([$this->_toolbar]);
 	}
 
-	public function getHtmlComponent(){
+	public function getHtmlComponent() {
 		return $this->content["table"];
 	}
 
@@ -236,18 +236,18 @@ 
 	 * @return \Ajax\semantic\widgets\datatable\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);
-		}else{
-			$this->_urls=["refresh"=>$urls,"edit"=>$urls,"delete"=>$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);
+		} else {
+			$this->_urls=["refresh"=>$urls, "edit"=>$urls, "delete"=>$urls];
 		}
 		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() {
@@ -259,7 +259,7 @@ 
 		return $this;
 	}
 
-	public function refresh($compileParts=["tbody"]){
+	public function refresh($compileParts=["tbody"]) {
 		$this->_compileParts=$compileParts;
 		return $this;
 	}
@@ -269,8 +269,8 @@ 
 	 * @param boolean $visibleHover
 	 * @return callable
 	 */
-	private function getFieldButtonCallable($caption,$visibleHover=true,$callback=null){
-		return $this->getCallable("getFieldButton",[$caption,$visibleHover],$callback);
+	private function getFieldButtonCallable($caption, $visibleHover=true, $callback=null) {
+		return $this->getCallable("getFieldButton", [$caption, $visibleHover], $callback);
 	}
 
 	/**
@@ -279,19 +279,19 @@ 
 	 * @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->propertyContains("class","visibleover")){
+			if ($object instanceof HtmlSemDoubleElement) {
+				$object->setProperty("data-ajax", $this->_instanceViewer->getIdentifier());
+				if ($object->propertyContains("class", "visibleover")) {
 					$this->_visibleHover=true;
-					$object->setProperty("style","visibility:hidden;");
+					$object->setProperty("style", "visibility:hidden;");
 				}
 			}
 			return $object;
@@ -303,9 +303,9 @@ 
 	 * @param string $caption
 	 * @return HtmlButton
 	 */
-	private function getFieldButton($caption,$visibleHover=true){
-		$bt= new HtmlButton("",$caption);
-		if($visibleHover)
+	private function getFieldButton($caption, $visibleHover=true) {
+		$bt=new HtmlButton("", $caption);
+		if ($visibleHover)
 			$this->_visibleOver($bt);
 		return $bt;
 	}
@@ -317,8 +317,8 @@ 
 	 * @param boolean $visibleHover
 	 * @return \Ajax\semantic\widgets\datatable\DataTable
 	 */
-	public function addFieldButton($caption,$visibleHover=true,$callback=null){
-		$this->addField($this->getCallable("getFieldButton",[$caption,$visibleHover],$callback));
+	public function addFieldButton($caption, $visibleHover=true, $callback=null) {
+		$this->addField($this->getCallable("getFieldButton", [$caption, $visibleHover], $callback));
 		return $this;
 	}
 
@@ -329,8 +329,8 @@ 
 	 * @param callable $callback
 	 * @return \Ajax\semantic\widgets\datatable\DataTable
 	 */
-	public function insertFieldButton($index,$caption,$visibleHover=true,$callback=null){
-		$this->insertField($index, $this->getFieldButtonCallable($caption,$visibleHover,$callback));
+	public function insertFieldButton($index, $caption, $visibleHover=true, $callback=null) {
+		$this->insertField($index, $this->getFieldButtonCallable($caption, $visibleHover, $callback));
 		return $this;
 	}
 
@@ -341,64 +341,64 @@ 
 	 * @param callable $callback
 	 * @return \Ajax\semantic\widgets\datatable\DataTable
 	 */
-	public function insertInFieldButton($index,$caption,$visibleHover=true,$callback=null){
-		$this->insertInField($index, $this->getFieldButtonCallable($caption,$visibleHover,$callback));
+	public function insertInFieldButton($index, $caption, $visibleHover=true, $callback=null) {
+		$this->insertInField($index, $this->getFieldButtonCallable($caption, $visibleHover, $callback));
 		return $this;
 	}
 
-	private function addDefaultButton($icon,$class=null,$visibleHover=true,$callback=null){
-		$this->addField($this->getCallable("getDefaultButton",[$icon,$class,$visibleHover],$callback));
+	private function addDefaultButton($icon, $class=null, $visibleHover=true, $callback=null) {
+		$this->addField($this->getCallable("getDefaultButton", [$icon, $class, $visibleHover], $callback));
 		return $this;
 	}
 
-	private function insertDefaultButtonIn($index,$icon,$class=null,$visibleHover=true,$callback=null){
-		$this->insertInField($index,$this->getCallable("getDefaultButton",[$icon,$class,$visibleHover],$callback));
+	private function insertDefaultButtonIn($index, $icon, $class=null, $visibleHover=true, $callback=null) {
+		$this->insertInField($index, $this->getCallable("getDefaultButton", [$icon, $class, $visibleHover], $callback));
 		return $this;
 	}
 
-	private function getDefaultButton($icon,$class=null,$visibleHover=true){
-		$bt=$this->getFieldButton("",$visibleHover);
+	private function getDefaultButton($icon, $class=null, $visibleHover=true) {
+		$bt=$this->getFieldButton("", $visibleHover);
 		$bt->asIcon($icon);
-		if(isset($class))
+		if (isset($class))
 			$bt->addToProperty("class", $class);
 		return $bt;
 	}
 
-	public function addDeleteButton($visibleHover=true,$generateBehavior=true,$callback=null){
+	public function addDeleteButton($visibleHover=true, $generateBehavior=true, $callback=null) {
 		$this->_hasDelete=$generateBehavior;
-		return $this->addDefaultButton("remove","delete red basic",$visibleHover,$callback);
+		return $this->addDefaultButton("remove", "delete red basic", $visibleHover, $callback);
 	}
 
-	public function addEditButton($visibleHover=true,$generateBehavior=true,$callback=null){
+	public function addEditButton($visibleHover=true, $generateBehavior=true, $callback=null) {
 		$this->_hasEdit=$generateBehavior;
-		return $this->addDefaultButton("edit","edit basic",$visibleHover,$callback);
+		return $this->addDefaultButton("edit", "edit basic", $visibleHover, $callback);
 	}
 
-	public function addEditDeleteButtons($visibleHover=true,$generateBehavior=true,$callbackEdit=null,$callbackDelete=null){
-		$this->addEditButton($visibleHover,$generateBehavior,$callbackEdit);
+	public function addEditDeleteButtons($visibleHover=true, $generateBehavior=true, $callbackEdit=null, $callbackDelete=null) {
+		$this->addEditButton($visibleHover, $generateBehavior, $callbackEdit);
 		$index=$this->_instanceViewer->visiblePropertiesCount()-1;
-		$this->insertDeleteButtonIn($index,$visibleHover,$generateBehavior,$callbackDelete);
+		$this->insertDeleteButtonIn($index, $visibleHover, $generateBehavior, $callbackDelete);
 		return $this;
 	}
 
-	public function insertDeleteButtonIn($index,$visibleHover=true,$generateBehavior=true,$callback=null){
+	public function insertDeleteButtonIn($index, $visibleHover=true, $generateBehavior=true, $callback=null) {
 		$this->_hasDelete=$generateBehavior;
-		return $this->insertDefaultButtonIn($index,"remove","delete red basic",$visibleHover,$callback);
+		return $this->insertDefaultButtonIn($index, "remove", "delete red basic", $visibleHover, $callback);
 	}
 
-	public function insertEditButtonIn($index,$visibleHover=true,$generateBehavior=true,$callback=null){
+	public function insertEditButtonIn($index, $visibleHover=true, $generateBehavior=true, $callback=null) {
 		$this->_hasEdit=$generateBehavior;
-		return $this->insertDefaultButtonIn($index,"edit","edit basic",$visibleHover,$callback);
+		return $this->insertDefaultButtonIn($index, "edit", "edit basic", $visibleHover, $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;
 	}
@@ -414,7 +414,7 @@ 
 		return $this;
 	}
 
-	public function asForm(){
+	public function asForm() {
 		return $this->getForm();
 	}
 
@@ -427,24 +427,24 @@ 
 	 * @param array $attributes
 	 * @return \Ajax\semantic\widgets\datatable\DataTable
 	 */
-	public function fieldAsSubmit($index,$cssStyle=NULL,$url=NULL,$responseElement=NULL,$attributes=NULL){
-		return $this->_fieldAs(function($id,$name,$value,$caption) use ($url,$responseElement,$cssStyle,$index,$attributes){
-			$button=new HtmlButton($id,$value,$cssStyle);
-			$button->postOnClick($url,"$(event.target).closest('tr').find(':input').serialize()",$responseElement,$attributes["ajax"]);
-			if(!isset($attributes["visibleHover"]) || $attributes["visibleHover"])
+	public function fieldAsSubmit($index, $cssStyle=NULL, $url=NULL, $responseElement=NULL, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) use ($url, $responseElement, $cssStyle, $index, $attributes){
+			$button=new HtmlButton($id, $value, $cssStyle);
+			$button->postOnClick($url, "$(event.target).closest('tr').find(':input').serialize()", $responseElement, $attributes["ajax"]);
+			if (!isset($attributes["visibleHover"]) || $attributes["visibleHover"])
 				$this->_visibleOver($button);
 			return $button;
-		}, $index,$attributes);
+		}, $index, $attributes);
 	}
 
-	protected function _visibleOver($element){
+	protected function _visibleOver($element) {
 		$this->_visibleHover=true;
-		return $element->addToProperty("class", "visibleover")->setProperty("style","visibility:hidden;");
+		return $element->addToProperty("class", "visibleover")->setProperty("style", "visibility:hidden;");
 	}
 
 	protected function getTargetSelector() {
 		$result=$this->_targetSelector;
-		if(!isset($result))
+		if (!isset($result))
 			$result="#".$this->identifier;
 		return $result;
 	}
@@ -460,9 +460,9 @@ 
 	}
 
 	protected function getCheckedMessage() {
-		$result= $this->_checkedMessage;
-		if(!isset($result)){
-			$result=[0=>"none selected",1=>"one item selected","other"=>"{count} items selected"];
+		$result=$this->_checkedMessage;
+		if (!isset($result)) {
+			$result=[0=>"none selected", 1=>"one item selected", "other"=>"{count} items selected"];
 		}
 		return $result;
 	}
@@ -482,14 +482,14 @@ 
 	 * @param array $checkedMessage
 	 * @param callable $callback
 	 */
-	public function addCountCheckedInToolbar(array $checkedMessage=null,$callback=null){
-		if(isset($checkedMessage))
+	public function addCountCheckedInToolbar(array $checkedMessage=null, $callback=null) {
+		if (isset($checkedMessage))
 			$this->_checkedMessage=$checkedMessage;
 		$checkedMessage=$this->getCheckedMessage();
 		$this->_hasCheckboxes=true;
 		$this->_hasCheckedMessage=true;
-		$element=new HtmlLabel("checked-count-".$this->identifier,$checkedMessage[0]);
-		$this->addInToolbar($element,$callback);
+		$element=new HtmlLabel("checked-count-".$this->identifier, $checkedMessage[0]);
+		$this->addInToolbar($element, $callback);
 	}
 
 

Braces +38 added lines, -26 removed lines

@@ -51,10 +51,12 @@ 
 			$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->_hasDelete)
-			$this->_generateBehavior("delete", $js);
-		if($this->_hasEdit)
-			$this->_generateBehavior("edit", $js);
+		if($this->_hasDelete) {
+					$this->_generateBehavior("delete", $js);
+		}
+		if($this->_hasEdit) {
+					$this->_generateBehavior("edit", $js);
+		}
 		return parent::run($js);
 	}
 
@@ -77,8 +79,9 @@ 
 	}
 
 	protected function _generateBehavior($op,JsUtils $js){
-		if(isset($this->_urls[$op]))
-			$js->getOnClick("#".$this->identifier." .".$op, $this->_urls[$op],$this->getTargetSelector(),["preventDefault"=>false,"attr"=>"data-ajax"]);
+		if(isset($this->_urls[$op])) {
+					$js->getOnClick("#".$this->identifier." .".$op, $this->_urls[$op],$this->getTargetSelector(),["preventDefault"=>false,"attr"=>"data-ajax"]);
+		}
 	}
 
 	/**
@@ -103,12 +106,14 @@ 
 
 			$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) && isset($js)){
-				if(isset($this->_urls["refresh"]))
-					$this->_searchField->postOn("change", $this->_urls["refresh"],"{'s':$(this).val()}","#".$this->identifier." tbody",["preventDefault"=>false,"jqueryDone"=>"replaceWith"]);
+				if(isset($this->_urls["refresh"])) {
+									$this->_searchField->postOn("change", $this->_urls["refresh"],"{'s':$(this).val()}","#".$this->identifier." tbody",["preventDefault"=>false,"jqueryDone"=>"replaceWith"]);
+				}
 			}
 
 			$this->_generateContent($table);
@@ -133,8 +138,9 @@ 
 	private function _generateMainCheckbox(&$captions){
 		$ck=new HtmlCheckbox("main-ck-".$this->identifier,"");
 		$checkedMessageCall="";
-		if($this->_hasCheckedMessage)
-			$checkedMessageCall="updateChecked();";
+		if($this->_hasCheckedMessage) {
+					$checkedMessageCall="updateChecked();";
+		}
 		$ck->setOnChecked("$('#".$this->identifier." [name=%quote%selection[]%quote%]').prop('checked',true);".$checkedMessageCall);
 		$ck->setOnUnchecked("$('#".$this->identifier." [name=%quote%selection[]%quote%]').prop('checked',false);".$checkedMessageCall);
 		\array_unshift($captions, $ck);
@@ -171,8 +177,9 @@ 
 		$menu->floatRight();
 		$menu->setActiveItem($this->_pagination->getPage()-1);
 		$footer->setValues($menu);
-		if(isset($this->_urls["refresh"]))
-			$menu->postOnClick($this->_urls["refresh"],"{'p':$(this).attr('data-page')}","#".$this->identifier." tbody",["preventDefault"=>false,"jqueryDone"=>"replaceWith"]);
+		if(isset($this->_urls["refresh"])) {
+					$menu->postOnClick($this->_urls["refresh"],"{'p':$(this).attr('data-page')}","#".$this->identifier." tbody",["preventDefault"=>false,"jqueryDone"=>"replaceWith"]);
+		}
 	}
 
 	protected function _getFieldName($index){
@@ -215,7 +222,7 @@ 
 		$hasPart=$table->hasPart($part);
 		if($hasPart){
 			$row=$table->getPart($part)->addRow(\sizeof($captions));
-		}else{
+		} else{
 			$row=$table->getPart($part)->getRow(0);
 		}
 		$row->mergeCol();
@@ -240,7 +247,7 @@ 
 			$this->_urls["refresh"]=JArray::getValue($urls, "refresh",0);
 			$this->_urls["edit"]=JArray::getValue($urls, "edit",1);
 			$this->_urls["delete"]=JArray::getValue($urls, "delete",2);
-		}else{
+		} else{
 			$this->_urls=["refresh"=>$urls,"edit"=>$urls,"delete"=>$urls];
 		}
 		return $this;
@@ -305,8 +312,9 @@ 
 	 */
 	private function getFieldButton($caption,$visibleHover=true){
 		$bt= new HtmlButton("",$caption);
-		if($visibleHover)
-			$this->_visibleOver($bt);
+		if($visibleHover) {
+					$this->_visibleOver($bt);
+		}
 		return $bt;
 	}
 
@@ -359,8 +367,9 @@ 
 	private function getDefaultButton($icon,$class=null,$visibleHover=true){
 		$bt=$this->getFieldButton("",$visibleHover);
 		$bt->asIcon($icon);
-		if(isset($class))
-			$bt->addToProperty("class", $class);
+		if(isset($class)) {
+					$bt->addToProperty("class", $class);
+		}
 		return $bt;
 	}
 
@@ -431,8 +440,9 @@ 
 		return $this->_fieldAs(function($id,$name,$value,$caption) use ($url,$responseElement,$cssStyle,$index,$attributes){
 			$button=new HtmlButton($id,$value,$cssStyle);
 			$button->postOnClick($url,"$(event.target).closest('tr').find(':input').serialize()",$responseElement,$attributes["ajax"]);
-			if(!isset($attributes["visibleHover"]) || $attributes["visibleHover"])
-				$this->_visibleOver($button);
+			if(!isset($attributes["visibleHover"]) || $attributes["visibleHover"]) {
+							$this->_visibleOver($button);
+			}
 			return $button;
 		}, $index,$attributes);
 	}
@@ -444,8 +454,9 @@ 
 
 	protected function getTargetSelector() {
 		$result=$this->_targetSelector;
-		if(!isset($result))
-			$result="#".$this->identifier;
+		if(!isset($result)) {
+					$result="#".$this->identifier;
+		}
 		return $result;
 	}
 
@@ -483,8 +494,9 @@ 
 	 * @param callable $callback
 	 */
 	public function addCountCheckedInToolbar(array $checkedMessage=null,$callback=null){
-		if(isset($checkedMessage))
-			$this->_checkedMessage=$checkedMessage;
+		if(isset($checkedMessage)) {
+					$this->_checkedMessage=$checkedMessage;
+		}
 		$checkedMessage=$this->getCheckedMessage();
 		$this->_hasCheckboxes=true;
 		$this->_hasCheckedMessage=true;