phpMv / phpMv-UI

Ajax/Bootstrap.php

Spacing +11 added lines, -11 removed lines

@@ -172,8 +172,8 @@ 
 	 * @param string $tagName container tagName
 	 * @return HtmlListgroup
 	 */
-	public function htmlListgroup($identifier,$items=array(),$tagName="ul"){
-		$listGroup=new HtmlListgroup($identifier,$tagName);
+	public function htmlListgroup($identifier, $items=array(), $tagName="ul") {
+		$listGroup=new HtmlListgroup($identifier, $tagName);
 		$listGroup->addItems($items);
 		return $this->addHtmlComponent($listGroup);
 	}
@@ -198,8 +198,8 @@ 
 	 * @param string $onClick
 	 * @return HtmlSplitbutton
 	 */
-	public function htmlSplitbutton($identifier,$value="", $items=array(), $cssStyle="btn-default", $onClick=NULL) {
-		return $this->addHtmlComponent(new HtmlSplitbutton($identifier, $value, $items, $cssStyle,$onClick));
+	public function htmlSplitbutton($identifier, $value="", $items=array(), $cssStyle="btn-default", $onClick=NULL) {
+		return $this->addHtmlComponent(new HtmlSplitbutton($identifier, $value, $items, $cssStyle, $onClick));
 	}
 
 	/**
@@ -207,7 +207,7 @@ 
 	 * @param string $identifier
 	 * @return HtmlInputgroup
 	 */
-	public function htmlInputgroup($identifier){
+	public function htmlInputgroup($identifier) {
 		return $this->addHtmlComponent(new HtmlInputgroup($identifier));
 	}
 
@@ -219,8 +219,8 @@ 
 	 * @param callable $hrefFunction the function who generates the href elements. default : function($e){return $e->getContent()}
 	 * @return HtmlBreadcrumbs
 	 */
-	public function htmlBreadcrumbs($identifier,$elements=array(),$autoActive=true,$startIndex=0,$hrefFunction=NULL){
-		return $this->addHtmlComponent(new HtmlBreadcrumbs($identifier,$elements,$autoActive,$startIndex,$hrefFunction));
+	public function htmlBreadcrumbs($identifier, $elements=array(), $autoActive=true, $startIndex=0, $hrefFunction=NULL) {
+		return $this->addHtmlComponent(new HtmlBreadcrumbs($identifier, $elements, $autoActive, $startIndex, $hrefFunction));
 	}
 
 	/**
@@ -232,8 +232,8 @@ 
 	 * @param int $active The active page
 	 * @return HtmlPagination
 	 */
-	public function htmlPagination($identifier,$from=1,$to=1,$active=NULL,$countVisible=NULL){
-		return $this->addHtmlComponent(new HtmlPagination($identifier,$from,$to,$active,$countVisible));
+	public function htmlPagination($identifier, $from=1, $to=1, $active=NULL, $countVisible=NULL) {
+		return $this->addHtmlComponent(new HtmlPagination($identifier, $from, $to, $active, $countVisible));
 	}
 
 	/**
@@ -244,7 +244,7 @@ 
 	 * @param int $numCols
 	 * @return HtmlGridSystem
 	 */
-	public function htmlGridSystem($identifier,$numRows=1,$numCols=NULL){
-		return $this->addHtmlComponent(new HtmlGridSystem($identifier,$numRows,$numCols));
+	public function htmlGridSystem($identifier, $numRows=1, $numCols=NULL) {
+		return $this->addHtmlComponent(new HtmlGridSystem($identifier, $numRows, $numCols));
 	}
 }

Ajax/ui/components/DialogButton.php

Spacing +3 added lines, -3 removed lines

@@ -15,7 +15,7 @@ 
 
 	private function addFunction($jsCode) {
 		if (!JString::startsWith($jsCode, "function"))
-			$jsCode="%function(){" . $jsCode . "}%";
+			$jsCode="%function(){".$jsCode."}%";
 		return $jsCode;
 	}
 
@@ -50,7 +50,7 @@ 
 	 * @param array $parameters default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null)
 	 * @return DialogButton
 	 */
-	public static function submitButton(JsUtils $js, $url, $form, $responseElement, $caption="Okay",$parameters=[]) {
-		return new DialogButton($caption, $js->postFormDeferred($url, $form, $responseElement,$parameters) . ";$( this ).dialog( 'close' );");
+	public static function submitButton(JsUtils $js, $url, $form, $responseElement, $caption="Okay", $parameters=[]) {
+		return new DialogButton($caption, $js->postFormDeferred($url, $form, $responseElement, $parameters).";$( this ).dialog( 'close' );");
 	}
 }

Braces +3 added lines, -2 removed lines

@@ -14,8 +14,9 @@
 class DialogButton extends BaseComponent {
 
 	private function addFunction($jsCode) {
-		if (!JString::startsWith($jsCode, "function"))
-			$jsCode="%function(){" . $jsCode . "}%";
+		if (!JString::startsWith($jsCode, "function")) {
+					$jsCode="%function(){" . $jsCode . "}%";
+		}
 		return $jsCode;
 	}
 

Ajax/bootstrap/html/HtmlPagination.php

Spacing +34 added lines, -34 removed lines

@@ -45,70 +45,70 @@ 
 	/**
 	 * @param string $identifier
 	 */
-	public function __construct($identifier,$from=1,$to=1,$active=NULL,$countVisible=NULL){
-		parent::__construct($identifier,"ul");
+	public function __construct($identifier, $from=1, $to=1, $active=NULL, $countVisible=NULL) {
+		parent::__construct($identifier, "ul");
 		$this->setProperty("class", "pagination");
 		$this->active=$active;
 		$this->from=$from;
 		$this->to=$to;
 		$this->urlMask="%page%";
-		if(!isset($countVisible))
+		if (!isset($countVisible))
 			$this->countVisible=$to-$from+1;
 		else
 			$this->countVisible=$countVisible;
 		$this->createContent();
 	}
 
-	private function createElement($num,$content,$disabled=false,$current=false){
+	private function createElement($num, $content, $disabled=false, $current=false) {
 		$count=sizeof($this->content)+1;
-		$elem=new HtmlBsDoubleElement("li-".$this->identifier."-".$count,"li");
-		if($disabled){
+		$elem=new HtmlBsDoubleElement("li-".$this->identifier."-".$count, "li");
+		if ($disabled) {
 			$elem->setProperty("class", "disabled");
 		}
-		if($current){
+		if ($current) {
 			$content.="<span class='sr-only'>(current)</span>";
 			$elem->setProperty("class", "active");
 		}
-		if(!$disabled){
+		if (!$disabled) {
 			$url=$this->getUrl($num);
-			$href=new HtmlLink("a-".$this->identifier."-".$count,$url,$content);
+			$href=new HtmlLink("a-".$this->identifier."-".$count, $url, $content);
 			$href->setProperty($this->attr, $url);
 			$elem->setContent($href);
-		}else{
+		} else {
 			$elem->setContent($content);
 		}
 		$this->content[]=$elem;
 		return $this;
 	}
 
-	protected function createContent(){
+	protected function createContent() {
 		$this->content=array();
-		$this->createElement($this->active-1,"<span aria-hidden='true'>&laquo;</span>",$this->active===1);
+		$this->createElement($this->active-1, "<span aria-hidden='true'>&laquo;</span>", $this->active===1);
 		$start=$this->getStart();
-		$end=min($start+$this->countVisible-1,$this->to);
-		for($index=$start;$index<=$end;$index++){
-			$this->createElement($index,$index,false,$index===$this->active);
+		$end=min($start+$this->countVisible-1, $this->to);
+		for ($index=$start; $index<=$end; $index++) {
+			$this->createElement($index, $index, false, $index===$this->active);
 		}
-		$this->createElement($this->active+1,"<span aria-hidden='true'>&raquo;</span>",$this->active===$this->to);
+		$this->createElement($this->active+1, "<span aria-hidden='true'>&raquo;</span>", $this->active===$this->to);
 	}
 
-	protected function half(){
+	protected function half() {
 		return (int)($this->countVisible/2);
 	}
 
-	protected function getStart(){
+	protected function getStart() {
 		$result=1;
-		if($this->countVisible!==$this->to-$this->from+1){
-			$result=max($this->active-$this->half(),$result);
+		if ($this->countVisible!==$this->to-$this->from+1) {
+			$result=max($this->active-$this->half(), $result);
 		}
 		return $result;
 	}
 
 	public function _addEvent($event, $jsCode) {
-		foreach ($this->content as $li){
+		foreach ($this->content as $li) {
 			$content=$li->getContent();
-			if($content instanceof BaseHtml)
-				$content->_addEvent($event,$jsCode);
+			if ($content instanceof BaseHtml)
+				$content->_addEvent($event, $jsCode);
 		}
 	}
 	/**
@@ -117,14 +117,14 @@ 
 	 * @param object $dispatcher the request dispatcher
 	 * @return \Ajax\bootstrap\html\HtmlPagination
 	 */
-	public function fromDispatcher(JsUtils $js,$dispatcher,$startIndex=0){
+	public function fromDispatcher(JsUtils $js, $dispatcher, $startIndex=0) {
 		$items=$js->fromDispatcher($dispatcher);
 		$url=implode("/", $items);
-		if($this->urlMask==="%page%"){
+		if ($this->urlMask==="%page%") {
 			$this->urlMask=preg_replace("/[0-9]/", "%page%", $url);
 		}
-		for($index=$this->from;$index<=$this->to;$index++){
-			if($this->getUrl($index)==$url){
+		for ($index=$this->from; $index<=$this->to; $index++) {
+			if ($this->getUrl($index)==$url) {
 				$this->setActive($index);
 				break;
 			}
@@ -132,7 +132,7 @@ 
 		return $this;
 	}
 
-	public function getUrl($index){
+	public function getUrl($index) {
 		return str_ireplace("%page%", $index, $this->urlMask);
 	}
 
@@ -146,7 +146,7 @@ 
 		if (is_int($size)) {
 			return $this->addToPropertyUnique("class", CssRef::sizes("pagination")[$size], CssRef::sizes("pagination"));
 		}
-		if(!JString::startsWith($size, "pagination-") && $size!=="")
+		if (!JString::startsWith($size, "pagination-") && $size!=="")
 			$size="pagination-".$size;
 		return $this->addToPropertyCtrl("class", $size, CssRef::sizes("pagination"));
 	}
@@ -155,7 +155,7 @@ 
 		return $this->from;
 	}
 	public function setFrom($from) {
-		$this->from = $from;
+		$this->from=$from;
 		$this->createContent();
 		return $this;
 	}
@@ -163,7 +163,7 @@ 
 		return $this->to;
 	}
 	public function setTo($to) {
-		$this->to = $to;
+		$this->to=$to;
 		$this->createContent();
 		return $this;
 	}
@@ -171,7 +171,7 @@ 
 		return $this->active;
 	}
 	public function setActive($active) {
-		$this->active = $active;
+		$this->active=$active;
 		$this->createContent();
 		return $this;
 	}
@@ -179,7 +179,7 @@ 
 		return $this->urlMask;
 	}
 	public function setUrlMask($urlMask) {
-		$this->urlMask = $urlMask;
+		$this->urlMask=$urlMask;
 		$this->createContent();
 		return $this;
 	}
@@ -187,7 +187,7 @@ 
 		return $this->countVisible;
 	}
 	public function setCountVisible($countVisible) {
-		$this->countVisible = $countVisible;
+		$this->countVisible=$countVisible;
 		$this->createContent();
 		return $this;
 	}

Braces +12 added lines, -9 removed lines

@@ -52,10 +52,11 @@ 
 		$this->from=$from;
 		$this->to=$to;
 		$this->urlMask="%page%";
-		if(!isset($countVisible))
-			$this->countVisible=$to-$from+1;
-		else
-			$this->countVisible=$countVisible;
+		if(!isset($countVisible)) {
+					$this->countVisible=$to-$from+1;
+		} else {
+					$this->countVisible=$countVisible;
+		}
 		$this->createContent();
 	}
 
@@ -74,7 +75,7 @@ 
 			$href=new HtmlLink("a-".$this->identifier."-".$count,$url,$content);
 			$href->setProperty($this->attr, $url);
 			$elem->setContent($href);
-		}else{
+		} else{
 			$elem->setContent($content);
 		}
 		$this->content[]=$elem;
@@ -107,8 +108,9 @@ 
 	public function _addEvent($event, $jsCode) {
 		foreach ($this->content as $li){
 			$content=$li->getContent();
-			if($content instanceof BaseHtml)
-				$content->_addEvent($event,$jsCode);
+			if($content instanceof BaseHtml) {
+							$content->_addEvent($event,$jsCode);
+			}
 		}
 	}
 	/**
@@ -146,8 +148,9 @@ 
 		if (is_int($size)) {
 			return $this->addToPropertyUnique("class", CssRef::sizes("pagination")[$size], CssRef::sizes("pagination"));
 		}
-		if(!JString::startsWith($size, "pagination-") && $size!=="")
-			$size="pagination-".$size;
+		if(!JString::startsWith($size, "pagination-") && $size!=="") {
+					$size="pagination-".$size;
+		}
 		return $this->addToPropertyCtrl("class", $size, CssRef::sizes("pagination"));
 	}
 

Ajax/common/html/html5/HtmlUtils.php

Spacing +2 added lines, -2 removed lines

@@ -3,11 +3,11 @@
 namespace Ajax\common\html\html5;
 
 class HtmlUtils {
-	public static function javascriptInclude($url){
+	public static function javascriptInclude($url) {
 		return '<script src="'.$url.'"></script>';
 	}
 	
-	public static function stylesheetInclude($url){
+	public static function stylesheetInclude($url) {
 		return '<link rel="stylesheet" type="text/css" href="'.$url.'">';
 	}
 }

Ajax/common/html/traits/BaseHtmlPropertiesTrait.php

Spacing +12 added lines, -12 removed lines

@@ -8,12 +8,12 @@ 
  * @author jc
  * @property BaseWidget $_self
  */
-trait BaseHtmlPropertiesTrait{
+trait BaseHtmlPropertiesTrait {
 
-	protected $properties=array ();
+	protected $properties=array();
 	abstract protected function ctrl($name, $value, $typeCtrl);
 	abstract protected function removeOldValues(&$oldValue, $allValues);
-	abstract protected function _getElementBy($callback,$elements);
+	abstract protected function _getElementBy($callback, $elements);
 	public function getProperties() {
 		return $this->_self->properties;
 	}
@@ -45,14 +45,14 @@ 
 	 */
 	public function addToProperty($name, $value, $separator=" ") {
 		if (\is_array($value)) {
-			foreach ( $value as $v ) {
+			foreach ($value as $v) {
 				$this->_self->addToProperty($name, $v, $separator);
 			}
-		} else if ($value !== "" && $this->_self->propertyContains($name, $value) === false) {
-			if(isset($this->_self->properties[$name])){
+		} else if ($value!=="" && $this->_self->propertyContains($name, $value)===false) {
+			if (isset($this->_self->properties[$name])) {
 				$v=$this->_self->properties[$name];
-				if (isset($v) && $v !== "")
-					$v=$v . $separator . $value;
+				if (isset($v) && $v!=="")
+					$v=$v.$separator.$value;
 					else
 						$v=$value;
 	
@@ -91,7 +91,7 @@ 
 	}
 
 	public function addToPropertyCtrlCheck($name, $value, $typeCtrl) {
-		if ($this->_self->ctrl($name, $value, $typeCtrl) === true) {
+		if ($this->_self->ctrl($name, $value, $typeCtrl)===true) {
 			return $this->_self->addToProperty($name, $value);
 		}
 		return $this;
@@ -112,12 +112,12 @@ 
 	}
 
 	protected function setPropertyCtrl($name, $value, $typeCtrl) {
-		if ($this->_self->ctrl($name, $value, $typeCtrl) === true)
+		if ($this->_self->ctrl($name, $value, $typeCtrl)===true)
 			return $this->_self->setProperty($name, $value);
 			return $this;
 	}
 
-	protected function getElementByPropertyValue($propertyName,$value, $elements) {
-		return $this->_self->_getElementBy(function(BaseHtml $element) use ($propertyName,$value){return $element->propertyContains($propertyName, $value) === true;}, $elements);
+	protected function getElementByPropertyValue($propertyName, $value, $elements) {
+		return $this->_self->_getElementBy(function(BaseHtml $element) use ($propertyName, $value){return $element->propertyContains($propertyName, $value)===true; }, $elements);
 	}
 }

Braces +17 added lines, -12 removed lines

@@ -33,8 +33,9 @@ 
 	}
 
 	public function getProperty($name) {
-		if (array_key_exists($name, $this->_self->properties))
-			return $this->_self->properties[$name];
+		if (array_key_exists($name, $this->_self->properties)) {
+					return $this->_self->properties[$name];
+		}
 	}
 
 	/**
@@ -51,10 +52,11 @@ 
 		} else if ($value !== "" && $this->_self->propertyContains($name, $value) === false) {
 			if(isset($this->_self->properties[$name])){
 				$v=$this->_self->properties[$name];
-				if (isset($v) && $v !== "")
-					$v=$v . $separator . $value;
-					else
-						$v=$value;
+				if (isset($v) && $v !== "") {
+									$v=$v . $separator . $value;
+				} else {
+											$v=$value;
+					}
 	
 				return $this->_self->setProperty($name, $v);
 			}
@@ -78,8 +80,9 @@ 
 	}
 
 	protected function addToPropertyUnique($name, $value, $typeCtrl) {
-		if (is_string($typeCtrl) && @class_exists($typeCtrl, true))
-			$typeCtrl=$typeCtrl::getConstants();
+		if (is_string($typeCtrl) && @class_exists($typeCtrl, true)) {
+					$typeCtrl=$typeCtrl::getConstants();
+		}
 			if (\is_array($typeCtrl)) {
 				$this->_self->removeOldValues($this->_self->properties[$name], $typeCtrl);
 			}
@@ -98,8 +101,9 @@ 
 	}
 
 	public function removeProperty($name) {
-		if (\array_key_exists($name, $this->_self->properties))
-			unset($this->_self->properties[$name]);
+		if (\array_key_exists($name, $this->_self->properties)) {
+					unset($this->_self->properties[$name]);
+		}
 			return $this;
 	}
 
@@ -112,8 +116,9 @@ 
 	}
 
 	protected function setPropertyCtrl($name, $value, $typeCtrl) {
-		if ($this->_self->ctrl($name, $value, $typeCtrl) === true)
-			return $this->_self->setProperty($name, $value);
+		if ($this->_self->ctrl($name, $value, $typeCtrl) === true) {
+					return $this->_self->setProperty($name, $value);
+		}
 			return $this;
 	}
 

Ajax/bootstrap/html/HtmlPanel.php

Braces +6 added lines, -4 removed lines

@@ -89,8 +89,9 @@ 
 	 * @return \Ajax\bootstrap\html\HtmlPanel default : "panel-default"
 	 */
 	public function setStyle($cssStyle) {
-		if (!JString::startsWith($cssStyle, "panel"))
-			$cssStyle="panel".$cssStyle;
+		if (!JString::startsWith($cssStyle, "panel")) {
+					$cssStyle="panel".$cssStyle;
+		}
 		return $this->addToPropertyCtrl("class", $cssStyle, CssRef::Styles("panel"));
 	}
 
@@ -132,7 +133,8 @@ 
 	 * @return $this default : false
 	 */
 	public function show($value) {
-		if ($this->_collapsable)
-			$this->_showOnStartup=$value;
+		if ($this->_collapsable) {
+					$this->_showOnStartup=$value;
+		}
 	}
 }

Ajax/common/Widget.php

Spacing +81 added lines, -81 removed lines

@@ -20,7 +20,7 @@ 
 use Ajax\semantic\html\modules\HtmlModal;
 
 abstract class Widget extends HtmlDoubleElement {
-	use FieldAsTrait,FormTrait;
+	use FieldAsTrait, FormTrait;
 
 	/**
 	 * @var string classname
@@ -53,17 +53,17 @@ 
 	protected $_generated;
 
 
-	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);
 		}
 		$this->_generated=false;
 	}
 
-	protected function _init($instanceViewer,$contentKey,$content,$edition){
+	protected function _init($instanceViewer, $contentKey, $content, $edition) {
 		$this->_instanceViewer=$instanceViewer;
 		$this->content=[$contentKey=>$content];
 		$this->_self=$content;
@@ -75,31 +75,31 @@ 
 	 * @param int|string $fieldName
 	 * @return int|string|boolean
 	 */
-	protected function _getIndex($fieldName){
+	protected function _getIndex($fieldName) {
 		$index=$fieldName;
-		if(\is_string($fieldName)){
+		if (\is_string($fieldName)) {
 			$fields=$this->_instanceViewer->getVisibleProperties();
 			$index=\array_search($fieldName, $fields);
 		}
 		return $index;
 	}
 
-	protected function _getFieldIdentifier($prefix,$name=""){
+	protected function _getFieldIdentifier($prefix, $name="") {
 		return $this->identifier."-{$prefix}-".$this->_instanceViewer->getIdentifier();
 	}
 
-	protected function _getFieldName($index){
+	protected function _getFieldName($index) {
 		return $this->_instanceViewer->getFieldName($index);
 	}
 
-	protected function _getFieldCaption($index){
+	protected function _getFieldCaption($index) {
 		return $this->_instanceViewer->getCaption($index);
 	}
 
-	abstract protected  function _setToolbarPosition($table,$captions=NULL);
+	abstract protected  function _setToolbarPosition($table, $captions=NULL);
 
-	public function show($modelInstance){
-		if(\is_array($modelInstance)){
+	public function show($modelInstance) {
+		if (\is_array($modelInstance)) {
 			$modelInstance=\json_decode(\json_encode($modelInstance), FALSE);
 		}
 		$this->_modelInstance=$modelInstance;
@@ -125,7 +125,7 @@ 
 
 	abstract public function getHtmlComponent();
 
-	public function setAttached($value=true){
+	public function setAttached($value=true) {
 		return $this->getHtmlComponent()->setAttached($value);
 	}
 
@@ -136,59 +136,59 @@ 
 	 * @param callable $callback function called after the field compilation
 	 * @return Widget
 	 */
-	public function afterCompile($index,$callback){
+	public function afterCompile($index, $callback) {
 		$index=$this->_getIndex($index);
 		$this->_instanceViewer->afterCompile($index, $callback);
 		return $this;
 	}
 
-	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 setCaption($index,$caption){
+	public function setCaption($index, $caption) {
 		$this->_instanceViewer->setCaption($this->_getIndex($index), $caption);
 		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 addFields($fields){
+	public function addFields($fields) {
 		$this->_instanceViewer->addFields($fields);
 		return $this;
 	}
 
-	public function addMessage($attributes=NULL,$fieldName="message"){
+	public function addMessage($attributes=NULL, $fieldName="message") {
 		$this->_instanceViewer->addField($fieldName);
 		$count=$this->_instanceViewer->visiblePropertiesCount();
-		return $this->fieldAsMessage($count-1,$attributes);
+		return $this->fieldAsMessage($count-1, $attributes);
 	}
 
-	public function addErrorMessage(){
-		return $this->addMessage(["error"=>true],"message");
+	public function addErrorMessage() {
+		return $this->addMessage(["error"=>true], "message");
 	}
 
-	public function insertField($index,$field){
+	public function insertField($index, $field) {
 		$index=$this->_getIndex($index);
 		$this->_instanceViewer->insertField($index, $field);
 		return $this;
 	}
 
-	public function insertInField($index,$field){
+	public function insertInField($index, $field) {
 		$index=$this->_getIndex($index);
 		$this->_instanceViewer->insertInField($index, $field);
 		return $this;
@@ -200,13 +200,13 @@ 
 	 * @param callable $callback function parameters are : $value : the field value, $instance : the active instance of model, $fieldIndex : the field index, $rowIndex : the row index
 	 * @return Widget
 	 */
-	public function setValueFunction($index,$callback){
+	public function setValueFunction($index, $callback) {
 		$index=$this->_getIndex($index);
 		$this->_instanceViewer->setValueFunction($index, $callback);
 		return $this;
 	}
 
-	public function setIdentifierFunction($callback){
+	public function setIdentifierFunction($callback) {
 		$this->_instanceViewer->setIdentifierFunction($callback);
 		return $this;
 	}
@@ -214,8 +214,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);
 		}
 		return $this->_toolbar;
@@ -227,15 +227,15 @@ 
 	 * @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($element instanceof BaseWidget){
-			if($element->getIdentifier()===""){
+		if ($element instanceof BaseWidget) {
+			if ($element->getIdentifier()==="") {
 				$element->setIdentifier("tb-item-".$this->identifier."-".$tb->count());
 			}
 		}
-		if(isset($callback)){
-			if(\is_callable($callback)){
+		if (isset($callback)) {
+			if (\is_callable($callback)) {
 				$callback($element);
 			}
 		}
@@ -248,9 +248,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) && method_exists($result, "addIcon"))
+	public function addItemInToolbar($caption, $icon=NULL, $callback=NULL) {
+		$result=$this->addInToolbar($caption, $callback);
+		if (isset($icon) && method_exists($result, "addIcon"))
 			$result->addIcon($icon);
 		return $result;
 	}
@@ -260,14 +260,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;
@@ -279,12 +279,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);
 	}
 
 	/**
@@ -293,9 +293,9 @@ 
 	 * @param callable $callback function($element)
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
-	public function addButtonInToolbar($caption,$cssStyle=null,$callback=NULL){
-		$bt=new HtmlButton("bt-".$caption,$caption,$cssStyle);
-		return $this->addInToolbar($bt,$callback);
+	public function addButtonInToolbar($caption, $cssStyle=null, $callback=NULL) {
+		$bt=new HtmlButton("bt-".$caption, $caption, $cssStyle);
+		return $this->addInToolbar($bt, $callback);
 	}
 
 	/**
@@ -304,9 +304,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);
 	}
 
 	/**
@@ -316,15 +316,15 @@ 
 	 * @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);
 	}
 
-	public function addSubmitInToolbar($identifier,$value,$cssStyle=NULL,$url=NULL,$responseElement=NULL,$parameters=NULL){
-		$button=new HtmlButton($identifier,$value,$cssStyle);
-		$this->_buttonAsSubmit($button,"click",$url,$responseElement,$parameters);
+	public function addSubmitInToolbar($identifier, $value, $cssStyle=NULL, $url=NULL, $responseElement=NULL, $parameters=NULL) {
+		$button=new HtmlButton($identifier, $value, $cssStyle);
+		$this->_buttonAsSubmit($button, "click", $url, $responseElement, $parameters);
 		return $this->addInToolbar($button);
 	}
 
@@ -354,7 +354,7 @@ 
 	 * @param callable $defaultValueFunction function parameters are : $name : the field name, $value : the field value ,$index : the field index, $instance : the active instance of model
 	 * @return \Ajax\common\Widget
 	 */
-	public function setDefaultValueFunction($defaultValueFunction){
+	public function setDefaultValueFunction($defaultValueFunction) {
 		$this->_instanceViewer->setDefaultValueFunction($defaultValueFunction);
 		return $this;
 	}
@@ -363,7 +363,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.");";
 	}
 
@@ -372,12 +372,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);
 	}
 
 	public function setToolbar(HtmlMenu $_toolbar) {
@@ -391,34 +391,34 @@ 
 	}
 
 	public function getForm() {
-		if(!isset($this->_form)){
+		if (!isset($this->_form)) {
 			$this->_form=new HtmlForm("frm-".$this->identifier);
 			$this->setEdition(true);
 		}
 		return $this->_form;
 	}
 
-	public function run(JsUtils $js){
+	public function run(JsUtils $js) {
 		parent::run($js);
-		if(isset($this->_form)){
+		if (isset($this->_form)) {
 			$this->runForm($js);
 		}
 	}
 
-	protected function runForm(JsUtils $js){
+	protected function runForm(JsUtils $js) {
 		$fields=$this->getContentInstances(HtmlFormField::class);
-		foreach ($fields as $field){
+		foreach ($fields as $field) {
 			$this->_form->addField($field);
 		}
 		return $this->_form->run($js);
 	}
 
-	protected function _compileForm(){
-		if(isset($this->_form)){
+	protected function _compileForm() {
+		if (isset($this->_form)) {
 			$noValidate="";
-			if(\sizeof($this->_form->getValidationParams())>0)
+			if (\sizeof($this->_form->getValidationParams())>0)
 				$noValidate="novalidate";
-			$this->wrapContent("<form class='ui form' id='frm-".$this->identifier."' name='frm-".$this->identifier."' ".$noValidate.">","</form>");
+			$this->wrapContent("<form class='ui form' id='frm-".$this->identifier."' name='frm-".$this->identifier."' ".$noValidate.">", "</form>");
 		}
 	}
 
@@ -433,32 +433,32 @@ 
 		return $this;
 	}
 
-	public function moveFieldTo($from,$to){
+	public function moveFieldTo($from, $to) {
 		return $this->_instanceViewer->moveFieldTo($from, $to);
 	}
 
-	public function swapFields($index1,$index2){
+	public function swapFields($index1, $index2) {
 		$index1=$this->_getIndex($index1);
 		$index2=$this->_getIndex($index2);
 		return $this->_instanceViewer->swapFields($index1, $index2);
 	}
 
-	public function removeField($index){
+	public function removeField($index) {
 		$index=$this->_getIndex($index);
 		$this->_instanceViewer->removeField($index);
 		return $this;
 	}
 
-	public function asModal($header=null){
-		$modal=new HtmlModal("modal-".$this->identifier,$header);
+	public function asModal($header=null) {
+		$modal=new HtmlModal("modal-".$this->identifier, $header);
 		$modal->setContent($this);
-		if(isset($this->_form)){
+		if (isset($this->_form)) {
 			$this->_form->onSuccess($modal->jsHide());
 		}
 		return $modal;
 	}
 
 	public function addToProperty($name, $value, $separator=" ") {
-		return $this->getHtmlComponent()->addToProperty($name,$value,$separator);
+		return $this->getHtmlComponent()->addToProperty($name, $value, $separator);
 	}
 }

Braces +7 added lines, -5 removed lines

@@ -250,8 +250,9 @@ 
 	 */
 	public function addItemInToolbar($caption,$icon=NULL,$callback=NULL){
 		$result=$this->addInToolbar($caption,$callback);
-		if(isset($icon) && method_exists($result, "addIcon"))
-			$result->addIcon($icon);
+		if(isset($icon) && method_exists($result, "addIcon")) {
+					$result->addIcon($icon);
+		}
 		return $result;
 	}
 
@@ -265,7 +266,7 @@ 
 			foreach ($items as $icon=>$item){
 				$this->addItemInToolbar($item,$icon,$callback);
 			}
-		}else{
+		} else{
 			foreach ($items as $item){
 				$this->addItemInToolbar($item,null,$callback);
 			}
@@ -416,8 +417,9 @@ 
 	protected function _compileForm(){
 		if(isset($this->_form)){
 			$noValidate="";
-			if(\sizeof($this->_form->getValidationParams())>0)
-				$noValidate="novalidate";
+			if(\sizeof($this->_form->getValidationParams())>0) {
+							$noValidate="novalidate";
+			}
 			$this->wrapContent("<form class='ui form' id='frm-".$this->identifier."' name='frm-".$this->identifier."' ".$noValidate.">","</form>");
 		}
 	}

Ajax/semantic/widgets/datatable/DataTableFieldAsTrait.php

Spacing +57 added lines, -57 removed lines

@@ -13,21 +13,21 @@ 
  * @property boolean $_visibleHover
  * @property InstanceViewer $_instanceViewer
  */
-trait DataTableFieldAsTrait{
+trait DataTableFieldAsTrait {
 	abstract public function addField($field);
-	abstract public function insertField($index,$field);
-	abstract public function insertInField($index,$field);
-	abstract public function fieldAs($index,$type,$attributes=NULL);
+	abstract public function insertField($index, $field);
+	abstract public function insertInField($index, $field);
+	abstract public function fieldAs($index, $type, $attributes=NULL);
 	abstract protected function cleanIdentifier($id);
-	abstract protected function _fieldAs($elementCallback,&$index,$attributes=NULL,$prefix=null);
+	abstract protected function _fieldAs($elementCallback, &$index, $attributes=NULL, $prefix=null);
 	/**
 	 * @param string $caption
 	 * @param callable $callback
 	 * @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);
 	}
 
 	/**
@@ -36,20 +36,20 @@ 
 	 * @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,$this->_instanceViewer->count()+1);
+	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, $this->_instanceViewer->count()+1);
 				}
 			}
-			if($object instanceof HtmlSemDoubleElement){
+			if ($object instanceof HtmlSemDoubleElement) {
 				$id=$this->_instanceViewer->getIdentifier();
-				$object->setProperty("data-ajax",$id);
-				if($object->propertyContains("class","visibleover")){
+				$object->setProperty("data-ajax", $id);
+				if ($object->propertyContains("class", "visibleover")) {
 					$this->_visibleHover=true;
-					$object->setProperty("style","visibility:hidden;");
+					$object->setProperty("style", "visibility:hidden;");
 				}
 			}
 			return $object;
@@ -61,16 +61,16 @@ 
 	 * @param string $caption
 	 * @return HtmlButton
 	 */
-	private function getFieldButton($caption,$visibleHover=true){
-		$bt= new HtmlButton($this->cleanIdentifier($caption),$caption);
-		if($visibleHover)
+	private function getFieldButton($caption, $visibleHover=true) {
+		$bt=new HtmlButton($this->cleanIdentifier($caption), $caption);
+		if ($visibleHover)
 			$this->_visibleOver($bt);
 		return $bt;
 	}
 
-	private function getFieldButtons($buttons,$visibleHover=true){
-		$bts=new HtmlButtonGroups("",$buttons);
-		if($visibleHover)
+	private function getFieldButtons($buttons, $visibleHover=true) {
+		$bts=new HtmlButtonGroups("", $buttons);
+		if ($visibleHover)
 			$this->_visibleOver($bts);
 		return $bts;
 	}
@@ -84,19 +84,19 @@ 
 	 * @param array $attributes associative array (<b>ajax</b> key is for ajax post)
 	 * @return 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,$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, $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(BaseHtml $element){
+	protected function _visibleOver(BaseHtml $element) {
 		$this->_visibleHover=true;
-		return $element->addToProperty("class", "visibleover")->setProperty("style","visibility:hidden;");
+		return $element->addToProperty("class", "visibleover")->setProperty("style", "visibility:hidden;");
 	}
 
 	/**
@@ -106,8 +106,8 @@ 
 	 * @param boolean $visibleHover
 	 * @return 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;
 	}
 
@@ -118,8 +118,8 @@ 
 	 * @param boolean $visibleHover
 	 * @return DataTable
 	 */
-	public function addFieldButtons($buttons,$visibleHover=true,$callback=null){
-		$this->addField($this->getCallable("getFieldButtons",[$buttons,$visibleHover],$callback));
+	public function addFieldButtons($buttons, $visibleHover=true, $callback=null) {
+		$this->addField($this->getCallable("getFieldButtons", [$buttons, $visibleHover], $callback));
 		return $this;
 	}
 
@@ -130,8 +130,8 @@ 
 	 * @param callable $callback
 	 * @return 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;
 	}
 
@@ -142,25 +142,25 @@ 
 	 * @param callable $callback
 	 * @return 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->addClass($class);
 		return $bt;
 	}
@@ -172,9 +172,9 @@ 
 	 * @param callable $callback this function takes the following arguments : $object=>the delete button, $instance : the active instance of the object
 	 * @return DataTable
 	 */
-	public function addDeleteButton($visibleHover=true,$deleteBehavior=[],$callback=null){
+	public function addDeleteButton($visibleHover=true, $deleteBehavior=[], $callback=null) {
 		$this->_deleteBehavior=$deleteBehavior;
-		return $this->addDefaultButton("remove","_delete red basic",$visibleHover,$callback);
+		return $this->addDefaultButton("remove", "_delete red basic", $visibleHover, $callback);
 	}
 
 	/**
@@ -184,9 +184,9 @@ 
 	 * @param callable $callback this function takes the following arguments : $object=>the delete button, $instance : the active instance of the object
 	 * @return DataTable
 	 */
-	public function addEditButton($visibleHover=true,$editBehavior=[],$callback=null){
+	public function addEditButton($visibleHover=true, $editBehavior=[], $callback=null) {
 		$this->_editBehavior=$editBehavior;
-		return $this->addDefaultButton("edit","_edit basic",$visibleHover,$callback);
+		return $this->addDefaultButton("edit", "_edit basic", $visibleHover, $callback);
 	}
 
 	/**
@@ -197,20 +197,20 @@ 
 	 * @param callable $callbackDelete this function takes the following arguments : $object=>the delete button, $instance : the active instance of the object
 	 * @return DataTable
 	 */
-	public function addEditDeleteButtons($visibleHover=true,$behavior=[],$callbackEdit=null,$callbackDelete=null){
-		$this->addEditButton($visibleHover,$behavior,$callbackEdit);
+	public function addEditDeleteButtons($visibleHover=true, $behavior=[], $callbackEdit=null, $callbackDelete=null) {
+		$this->addEditButton($visibleHover, $behavior, $callbackEdit);
 		$index=$this->_instanceViewer->visiblePropertiesCount()-1;
-		$this->insertDeleteButtonIn($index,$visibleHover,$behavior,$callbackDelete);
+		$this->insertDeleteButtonIn($index, $visibleHover, $behavior, $callbackDelete);
 		return $this;
 	}
 
-	public function insertDeleteButtonIn($index,$visibleHover=true,$deleteBehavior=[],$callback=null){
+	public function insertDeleteButtonIn($index, $visibleHover=true, $deleteBehavior=[], $callback=null) {
 		$this->_deleteBehavior=$deleteBehavior;
-		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,$editBehavior=[],$callback=null){
+	public function insertEditButtonIn($index, $visibleHover=true, $editBehavior=[], $callback=null) {
 		$this->_editBehavior=$editBehavior;
-		return $this->insertDefaultButtonIn($index,"edit","_edit basic",$visibleHover,$callback);
+		return $this->insertDefaultButtonIn($index, "edit", "_edit basic", $visibleHover, $callback);
 	}
 }

Braces +12 added lines, -8 removed lines

@@ -63,15 +63,17 @@ 
 	 */
 	private function getFieldButton($caption,$visibleHover=true){
 		$bt= new HtmlButton($this->cleanIdentifier($caption),$caption);
-		if($visibleHover)
-			$this->_visibleOver($bt);
+		if($visibleHover) {
+					$this->_visibleOver($bt);
+		}
 		return $bt;
 	}
 
 	private function getFieldButtons($buttons,$visibleHover=true){
 		$bts=new HtmlButtonGroups("",$buttons);
-		if($visibleHover)
-			$this->_visibleOver($bts);
+		if($visibleHover) {
+					$this->_visibleOver($bts);
+		}
 		return $bts;
 	}
 
@@ -88,8 +90,9 @@ 
 		return $this->_fieldAs(function($id,$name,$value,$caption) use ($url,$responseElement,$cssStyle,$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);
 	}
@@ -160,8 +163,9 @@ 
 	private function getDefaultButton($icon,$class=null,$visibleHover=true){
 		$bt=$this->getFieldButton("",$visibleHover);
 		$bt->asIcon($icon);
-		if(isset($class))
-			$bt->addClass($class);
+		if(isset($class)) {
+					$bt->addClass($class);
+		}
 		return $bt;
 	}
 

Ajax/semantic/widgets/base/InstanceViewer.php

Spacing +91 added lines, -91 removed lines

@@ -19,220 +19,220 @@ 
 
 	public static $index=0;
 
-	public function __construct($identifier,$instance=NULL,$captions=NULL){
+	public function __construct($identifier, $instance=NULL, $captions=NULL) {
 		$this->widgetIdentifier=$identifier;
 		$this->values=[];
 		$this->afterCompile=[];
-		if(isset($instance))
+		if (isset($instance))
 			$this->setInstance($instance);
 		$this->setCaptions($captions);
 		$this->captionCallback=NULL;
-		$this->defaultValueFunction=function($name,$value){return $value;};
+		$this->defaultValueFunction=function($name, $value) {return $value; };
 	}
 
-	public function moveFieldTo($from,$to){
-		if(JArray::moveElementTo($this->visibleProperties, $from, $to)){
+	public function moveFieldTo($from, $to) {
+		if (JArray::moveElementTo($this->visibleProperties, $from, $to)) {
 			return JArray::moveElementTo($this->values, $from, $to);
 		}
 		return false;
 	}
 
-	public function swapFields($index1,$index2){
-		if(JArray::swapElements($this->visibleProperties, $index1, $index2)){
+	public function swapFields($index1, $index2) {
+		if (JArray::swapElements($this->visibleProperties, $index1, $index2)) {
 			return JArray::swapElements($this->values, $index1, $index2);
 		}
 		return false;
 	}
 
-	public function removeField($index){
-		\array_splice($this->visibleProperties,$index,1);
-		\array_splice($this->values,$index,1);
-		\array_splice($this->captions,$index,1);
+	public function removeField($index) {
+		\array_splice($this->visibleProperties, $index, 1);
+		\array_splice($this->values, $index, 1);
+		\array_splice($this->captions, $index, 1);
 		return $this;
 	}
 
-	public function getValues(){
+	public function getValues() {
 		$values=[];
 		$index=0;
 		$count=$this->count();
-		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"])){
-			if(\is_string($this->values["identifier"]))
+		if (isset($this->values["identifier"])) {
+			if (\is_string($this->values["identifier"]))
 				$value=JReflection::callMethod($this->instance, $this->values["identifier"], []);
 			else
-				$value=$this->values["identifier"]($index,$this->instance);
+				$value=$this->values["identifier"]($index, $this->instance);
 		}
 		return $value;
 	}
 
-	public function getValue($index){
+	public function getValue($index) {
 		$property=$this->properties[$index];
 		return $this->_getValue($property, $index);
 	}
 
-	protected function _beforeAddProperty($index,&$field){
+	protected function _beforeAddProperty($index, &$field) {
 
 	}
 
-	protected function _getDefaultValue($name,$value,$index){
+	protected function _getDefaultValue($name, $value, $index) {
 		$func=$this->defaultValueFunction;
-		return $func($name,$value,$index,$this->instance);
+		return $func($name, $value, $index, $this->instance);
 	}
 
-	protected function _getPropertyValue(\ReflectionProperty $property){
+	protected function _getPropertyValue(\ReflectionProperty $property) {
 		$property->setAccessible(true);
 		return $property->getValue($this->instance);
 	}
 
-	protected function _getValue($property,$index){
+	protected function _getValue($property, $index) {
 		$value=null;
 		$propertyName=$property;
-		if($property instanceof \ReflectionProperty){
+		if ($property instanceof \ReflectionProperty) {
 			$value=$this->_getPropertyValue($property);
 			$propertyName=$property->getName();
-		}elseif(\is_callable($property))
+		}elseif (\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);
-		}elseif(\is_string($property)){
+		}elseif (\is_string($property)) {
 			$value=$property;
-			if(isset($this->instance->{$property})){
+			if (isset($this->instance->{$property})) {
 				$value=$this->instance->{$property};
-			}elseif(\method_exists($this->instance, $getter=JReflection::getterName($property))){
+			}elseif (\method_exists($this->instance, $getter=JReflection::getterName($property))) {
 				$value=JReflection::callMethod($this->instance, $getter, []);
 			}
 		}
 		return $this->_postGetValue($index, $propertyName, $value);
 	}
 
-	protected function _postGetValue($index,$propertyName,$value){
-		if(isset($this->values[$index])){
-			$value= $this->values[$index]($value,$this->instance,$index,self::$index);
-		}else{
-			$value=$this->_getDefaultValue($propertyName,$value, $index);
+	protected function _postGetValue($index, $propertyName, $value) {
+		if (isset($this->values[$index])) {
+			$value=$this->values[$index]($value, $this->instance, $index, self::$index);
+		} else {
+			$value=$this->_getDefaultValue($propertyName, $value, $index);
 		}
-		if(isset($this->afterCompile[$index])){
-			if(\is_callable($this->afterCompile[$index])){
-				$this->afterCompile[$index]($value,$this->instance,self::$index);
+		if (isset($this->afterCompile[$index])) {
+			if (\is_callable($this->afterCompile[$index])) {
+				$this->afterCompile[$index]($value, $this->instance, self::$index);
 			}
 		}
 		return $value;
 	}
 
-	public function insertField($index,$field){
-		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 addFields($fields){
-		$this->visibleProperties=\array_merge($this->visibleProperties,$fields);
+	public function addFields($fields) {
+		$this->visibleProperties=\array_merge($this->visibleProperties, $fields);
 		return $this;
 	}
 
-	public function count(){
+	public function count() {
 		return \sizeof($this->properties);
 	}
 
-	public function visiblePropertiesCount(){
+	public function visiblePropertiesCount() {
 		return \sizeof($this->visibleProperties);
 	}
 
-	public function getProperty($index){
+	public function getProperty($index) {
 		return $this->properties[$index];
 	}
 
-	public function getFieldName($index){
+	public function getFieldName($index) {
 		$property=$this->getProperty($index);
-		if($property instanceof \ReflectionProperty){
+		if ($property instanceof \ReflectionProperty) {
 			$result=$property->getName();
-		}elseif(\is_callable($property)){
+		}elseif (\is_callable($property)) {
 			$result=$this->visibleProperties[$index];
-		}else{
+		} else {
 			$result=$property;
 		}
 		return $result;
 	}
 
 
-	protected function showableProperty(\ReflectionProperty $rProperty){
-		return JString::startswith($rProperty->getName(),"_")===false;
+	protected function showableProperty(\ReflectionProperty $rProperty) {
+		return JString::startswith($rProperty->getName(), "_")===false;
 	}
 
 	public function setInstance($instance) {
-		if(\is_string($instance)){
+		if (\is_string($instance)) {
 			$instance=new $instance();
 		}
 		$this->instance=$instance;
 		$this->properties=[];
 		$this->reflect=new \ReflectionClass($instance);
-		if(JArray::count($this->visibleProperties)===0){
+		if (JArray::count($this->visibleProperties)===0) {
 			$this->properties=$this->getDefaultProperties();
-		}else{
-			foreach ($this->visibleProperties as $property){
+		} else {
+			foreach ($this->visibleProperties as $property) {
 				$this->setInstanceProperty($property);
 			}
 		}
 		return $this;
 	}
 
-	private function setInstanceProperty($property){
-		if(\is_callable($property)){
+	private function setInstanceProperty($property) {
+		if (\is_callable($property)) {
 			$this->properties[]=$property;
-		}elseif(\is_string($property)){
-			try{
+		}elseif (\is_string($property)) {
+			try {
 				$this->_beforeAddProperty(\sizeof($this->properties), $property);
 				$rProperty=$this->reflect->getProperty($property);
 				$this->properties[]=$rProperty;
-			}catch(\Exception $e){
+			}catch (\Exception $e) {
 				$this->_beforeAddProperty(\sizeof($this->properties), $property);
 				$this->properties[]=$property;
 			}
-		}elseif(\is_int($property)){
+		}elseif (\is_int($property)) {
 			$props=$this->getDefaultProperties();
-			if(isset($props[$property]))
+			if (isset($props[$property]))
 				$this->properties[]=$props[$property];
 				else
 					$this->properties[]=$property;
-		}else{
+		} else {
 			$this->properties[]=$property;
 		}
 	}
 
-	protected function getDefaultProperties(){
+	protected function getDefaultProperties() {
 		$result=[];
 		$properties=$this->reflect->getProperties();
-		foreach ($properties as $property){
+		foreach ($properties as $property) {
 			$showable=$this->showableProperty($property);
-			if($showable!==false){
+			if ($showable!==false) {
 				$result[]=$property;
 			}
 		}
@@ -244,12 +244,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;
 	}
@@ -262,42 +262,42 @@ 
 		return $this->properties;
 	}
 
-	public function getCaption($index){
-		if(isset($this->captions[$index])){
+	public function getCaption($index) {
+		if (isset($this->captions[$index])) {
 			return $this->captions[$index];
 		}
-		if($this->properties[$index] instanceof \ReflectionProperty)
+		if ($this->properties[$index] instanceof \ReflectionProperty)
 			return $this->properties[$index]->getName();
-		elseif(\is_callable($this->properties[$index]))
+		elseif (\is_callable($this->properties[$index]))
 			return "";
 		else
 			return $this->properties[$index];
 	}
 
-	public function getCaptions(){
+	public function getCaptions() {
 		$count=$this->count();
-		if(isset($this->captions)){
-			$captions= \array_values($this->captions);
+		if (isset($this->captions)) {
+			$captions=\array_values($this->captions);
 			$captionsSize=\sizeof($captions);
-			for($i=$captionsSize;$i<$count;$i++){
+			for ($i=$captionsSize; $i<$count; $i++) {
 				$captions[]="";
 			}
-		}else{
+		} else {
 			$captions=[];
 			$index=0;
-			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;
@@ -315,7 +315,7 @@ 
 	 * @param callable $callback function called after the field compilation
 	 * @return InstanceViewer
 	 */
-	public function afterCompile($index,$callback){
+	public function afterCompile($index, $callback) {
 		$this->afterCompile[$index]=$callback;
 		return $this;
 	}

Braces +42 added lines, -36 removed lines

@@ -23,8 +23,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;};
@@ -62,14 +63,16 @@ 
 	}
 
 	public function getIdentifier($index=NULL){
-		if(!isset($index))
-			$index=self::$index;
+		if(!isset($index)) {
+					$index=self::$index;
+		}
 		$value=$index;
 		if(isset($this->values["identifier"])){
-			if(\is_string($this->values["identifier"]))
-				$value=JReflection::callMethod($this->instance, $this->values["identifier"], []);
-			else
-				$value=$this->values["identifier"]($index,$this->instance);
+			if(\is_string($this->values["identifier"])) {
+							$value=JReflection::callMethod($this->instance, $this->values["identifier"], []);
+			} else {
+							$value=$this->values["identifier"]($index,$this->instance);
+			}
 		}
 		return $value;
 	}
@@ -99,16 +102,16 @@ 
 		if($property instanceof \ReflectionProperty){
 			$value=$this->_getPropertyValue($property);
 			$propertyName=$property->getName();
-		}elseif(\is_callable($property))
-			$value=$property($this->instance);
-		elseif(\is_array($property)){
+		} elseif(\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);
-		}elseif(\is_string($property)){
+		} elseif(\is_string($property)){
 			$value=$property;
 			if(isset($this->instance->{$property})){
 				$value=$this->instance->{$property};
-			}elseif(\method_exists($this->instance, $getter=JReflection::getterName($property))){
+			} elseif(\method_exists($this->instance, $getter=JReflection::getterName($property))){
 				$value=JReflection::callMethod($this->instance, $getter, []);
 			}
 		}
@@ -118,7 +121,7 @@ 
 	protected function _postGetValue($index,$propertyName,$value){
 		if(isset($this->values[$index])){
 			$value= $this->values[$index]($value,$this->instance,$index,self::$index);
-		}else{
+		} else{
 			$value=$this->_getDefaultValue($propertyName,$value, $index);
 		}
 		if(isset($this->afterCompile[$index])){
@@ -139,10 +142,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;
@@ -174,9 +177,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;
@@ -196,7 +199,7 @@ 
 		$this->reflect=new \ReflectionClass($instance);
 		if(JArray::count($this->visibleProperties)===0){
 			$this->properties=$this->getDefaultProperties();
-		}else{
+		} else{
 			foreach ($this->visibleProperties as $property){
 				$this->setInstanceProperty($property);
 			}
@@ -207,22 +210,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;
 		}
 	}
@@ -266,12 +270,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(){
@@ -282,7 +287,7 @@ 
 			for($i=$captionsSize;$i<$count;$i++){
 				$captions[]="";
 			}
-		}else{
+		} else{
 			$captions=[];
 			$index=0;
 			while($index<$count){
@@ -297,8 +302,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;
 	}