phpMv / phpMv-UI

Ajax/common/traits/JsUtilsInternalTrait.php

Spacing +15 added lines, -15 removed lines

@@ -5,12 +5,12 @@ 
 
 trait JsUtilsInternalTrait {
 
-	protected $jquery_code_for_compile = array();
+	protected $jquery_code_for_compile=array();
 
-	protected $jquery_code_for_compile_at_last = array();
+	protected $jquery_code_for_compile_at_last=array();
 
 	protected function _addToCompile($jsScript) {
-		$this->jquery_code_for_compile[] = $jsScript;
+		$this->jquery_code_for_compile[]=$jsScript;
 	}
 
 	/**
@@ -18,7 +18,7 @@ 
 	 * @param BaseGui $library
 	 * @param mixed $view
 	 */
-	protected function _compileLibrary(BaseGui $library, &$view = NULL) {
+	protected function _compileLibrary(BaseGui $library, &$view=NULL) {
 		if (isset($view))
 			$library->compileHtml($this, $view);
 		if ($library->isAutoCompile()) {
@@ -27,21 +27,21 @@ 
 	}
 
 	protected function defer($script) {
-		$result = "(function(){window.defer=function (method) {if (window.jQuery) method(); else setTimeout(function() { window.defer(method); }, 50);};";
-		$result .= "window.defer(function(){" . $script . "})})()";
+		$result="(function(){window.defer=function (method) {if (window.jQuery) method(); else setTimeout(function() { window.defer(method); }, 50);};";
+		$result.="window.defer(function(){".$script."})})()";
 		return $result;
 	}
 
 	protected function ready($script) {
-		$result = '$(function() {' . "\n";
-		$result .= $script . '});';
+		$result='$(function() {'."\n";
+		$result.=$script.'});';
 		return $result;
 	}
 
 	protected function minify($input) {
-		if (trim($input) === "")
+		if (trim($input)==="")
 			return $input;
-		$input = preg_replace(array(
+		$input=preg_replace(array(
 			// Remove comment(s)
 			'#\s*("(?:[^"\\\]++|\\\.)*+"|\'(?:[^\'\\\\]++|\\\.)*+\')\s*|\s*\/\*(?!\!|@cc_on)(?>[\s\S]*?\*\/)\s*|\s*(?<![\:\=])\/\/.*(?=[\n\r]|$)|^\s*|\s*$#',
 			// Remove white-space(s) outside the string and regex
@@ -59,7 +59,7 @@ 
 			'$1$3',
 			'$1.$3'
 		), $input);
-		$input = str_replace("}$", "};$", $input);
+		$input=str_replace("}$", "};$", $input);
 		return $input;
 	}
 
@@ -69,9 +69,9 @@ 
 	 * @param string $src
 	 * @return string
 	 */
-	protected function _open_script($src = '') {
-		$str = '<script ';
-		$str .= ($src == '') ? '>' : ' src="' . $src . '">';
+	protected function _open_script($src='') {
+		$str='<script ';
+		$str.=($src=='') ? '>' : ' src="'.$src.'">';
 		return $str;
 	}
 
@@ -81,7 +81,7 @@ 
 	 * @param string $extra
 	 * @return string
 	 */
-	protected function _close_script($extra = "\n") {
+	protected function _close_script($extra="\n") {
 		return "</script>$extra";
 	}
 

Ajax/common/html/BaseHtml.php

Spacing +77 added lines, -77 removed lines

@@ -15,21 +15,21 @@ 
  * @version 1.3.3
  */
 abstract class BaseHtml extends BaseWidget {
-	use BaseHtmlEventsTrait,BaseHtmlPropertiesTrait;
+	use BaseHtmlEventsTrait, BaseHtmlPropertiesTrait;
 
 	protected $_template;
 
 	protected $tagName;
 
-	protected $_wrapBefore = array();
+	protected $_wrapBefore=array();
 
-	protected $_wrapAfter = array();
+	protected $_wrapAfter=array();
 
 	protected $_bsComponent;
 
-	protected $_compiled = false;
+	protected $_compiled=false;
 
-	protected $_runned = false;
+	protected $_runned=false;
 
 	protected $_postCompile;
 
@@ -43,31 +43,31 @@ 
 	abstract public function run(JsUtils $js);
 
 	private function _callSetter($setter, $key, $value, &$array) {
-		$result = false;
-		if (method_exists($this, $setter) && substr($setter, 0, 1) !== "_") {
+		$result=false;
+		if (method_exists($this, $setter) && substr($setter, 0, 1)!=="_") {
 			try {
 				$this->$setter($value);
 				unset($array[$key]);
-				$result = true;
-			} catch (\Exception $e) {
-				$result = false;
+				$result=true;
+			}catch (\Exception $e) {
+				$result=false;
 			}
 		}
 		return $result;
 	}
 
-	protected function getTemplate(JsUtils $js = NULL, $view = null) {
-		return PropertyWrapper::wrap($this->_wrapBefore, $js, $view) . $this->_template . PropertyWrapper::wrap($this->_wrapAfter, $js, $view);
+	protected function getTemplate(JsUtils $js=NULL, $view=null) {
+		return PropertyWrapper::wrap($this->_wrapBefore, $js, $view).$this->_template.PropertyWrapper::wrap($this->_wrapAfter, $js, $view);
 	}
 
 	protected function ctrl($name, $value, $typeCtrl) {
 		if (\is_array($typeCtrl)) {
-			if (array_search($value, $typeCtrl) === false) {
-				throw new \Exception("La valeur passée `" . $value . "` à la propriété `" . $name . "` ne fait pas partie des valeurs possibles : {" . implode(",", $typeCtrl) . "}");
+			if (array_search($value, $typeCtrl)===false) {
+				throw new \Exception("La valeur passée `".$value."` à la propriété `".$name."` ne fait pas partie des valeurs possibles : {".implode(",", $typeCtrl)."}");
 			}
 		} else {
-			if (! $typeCtrl($value)) {
-				throw new \Exception("La fonction " . $typeCtrl . " a retourné faux pour l'affectation de la propriété " . $name);
+			if (!$typeCtrl($value)) {
+				throw new \Exception("La fonction ".$typeCtrl." a retourné faux pour l'affectation de la propriété ".$name);
 			}
 		}
 		return true;
@@ -75,49 +75,49 @@ 
 
 	protected function setMemberCtrl(&$name, $value, $typeCtrl) {
 		$this->ctrl($name, $value, $typeCtrl);
-		$name = $value;
+		$name=$value;
 		return $this;
 	}
 
-	protected function addToMemberUnique(&$name, $value, $typeCtrl, $separator = " ") {
+	protected function addToMemberUnique(&$name, $value, $typeCtrl, $separator=" ") {
 		if (\is_array($typeCtrl)) {
 			$this->removeOldValues($name, $typeCtrl);
-			$name .= $separator . $value;
+			$name.=$separator.$value;
 		}
 		return $this;
 	}
 
-	protected function addToMemberCtrl(&$name, $value, $typeCtrl, $separator = " ") {
+	protected function addToMemberCtrl(&$name, $value, $typeCtrl, $separator=" ") {
 		$this->ctrl($name, $value, $typeCtrl);
 		if (\is_array($typeCtrl)) {
 			$this->removeOldValues($name, $typeCtrl);
 		}
-		$name .= $separator . $value;
+		$name.=$separator.$value;
 		return $this;
 	}
 
-	protected function addToMember(&$name, $value, $separator = ' ') {
-		$name = \str_ireplace($value, '', $name??'') . $separator . $value;
+	protected function addToMember(&$name, $value, $separator=' ') {
+		$name=\str_ireplace($value, '', $name ?? '').$separator.$value;
 		return $this;
 	}
 
 	protected function removeOldValues(&$oldValue, $allValues) {
-		$oldValue = \str_ireplace($allValues, '', $oldValue??'');
-		$oldValue = \trim($oldValue);
+		$oldValue=\str_ireplace($allValues, '', $oldValue ?? '');
+		$oldValue=\trim($oldValue);
 	}
 
 	protected function _getElementBy($callback, $elements) {
 		if (\is_array($elements)) {
-			$elements = \array_values($elements);
-			$flag = false;
-			$index = 0;
-			while (! $flag && $index < sizeof($elements)) {
+			$elements=\array_values($elements);
+			$flag=false;
+			$index=0;
+			while (!$flag && $index<sizeof($elements)) {
 				if ($elements[$index] instanceof BaseHtml)
-					$flag = ($callback($elements[$index]));
-				$index ++;
+					$flag=($callback($elements[$index]));
+				$index++;
 			}
-			if ($flag === true)
-				return $elements[$index - 1];
+			if ($flag===true)
+				return $elements[$index-1];
 		} elseif ($elements instanceof BaseHtml) {
 			if ($callback($elements))
 				return $elements;
@@ -126,12 +126,12 @@ 
 	}
 
 	protected function setWrapBefore($wrapBefore) {
-		$this->_wrapBefore = $wrapBefore;
+		$this->_wrapBefore=$wrapBefore;
 		return $this;
 	}
 
 	protected function setWrapAfter($wrapAfter) {
-		$this->_wrapAfter = $wrapAfter;
+		$this->_wrapAfter=$wrapAfter;
 		return $this;
 	}
 
@@ -140,18 +140,18 @@ 
 	}
 
 	public function setTagName($tagName) {
-		$this->tagName = $tagName;
+		$this->tagName=$tagName;
 		return $this;
 	}
 
 	public function fromArray($array) {
 		foreach ($this as $key => $value) {
-			if (array_key_exists($key, $array) === true)
-				$this->_callSetter("set" . ucfirst($key), $key, $array[$key], $array);
+			if (array_key_exists($key, $array)===true)
+				$this->_callSetter("set".ucfirst($key), $key, $array[$key], $array);
 		}
 		foreach ($array as $key => $value) {
-			if ($this->_callSetter($key, $key, $value, $array) === false) {
-				$this->_callSetter("set" . ucfirst($key), $key, $value, $array);
+			if ($this->_callSetter($key, $key, $value, $array)===false) {
+				$this->_callSetter("set".ucfirst($key), $key, $value, $array);
 			}
 		}
 		return $array;
@@ -168,17 +168,17 @@ 
 
 	public function fromDatabaseObject($object, $function) {}
 
-	public function wrap($before, $after = "") {
+	public function wrap($before, $after="") {
 		if (isset($before)) {
 			array_unshift($this->_wrapBefore, $before);
 		}
-		$this->_wrapAfter[] = $after;
+		$this->_wrapAfter[]=$after;
 		return $this;
 	}
 
 	public function getElementById($identifier, $elements) {
-		return $this->_getElementBy(function (BaseWidget $element) use ($identifier) {
-			return $element->getIdentifier() === $identifier;
+		return $this->_getElementBy(function(BaseWidget $element) use ($identifier) {
+			return $element->getIdentifier()===$identifier;
 		}, $elements);
 	}
 
@@ -187,50 +187,50 @@ 
 	}
 
 	public function setBsComponent($bsComponent) {
-		$this->_bsComponent = $bsComponent;
+		$this->_bsComponent=$bsComponent;
 		return $this;
 	}
 
-	protected function compile_once(JsUtils $js = NULL, &$view = NULL) {
-		if (! $this->_compiled) {
+	protected function compile_once(JsUtils $js=NULL, &$view=NULL) {
+		if (!$this->_compiled) {
 			if (isset($js)) {
-				$beforeCompile = $js->getParam("beforeCompileHtml");
+				$beforeCompile=$js->getParam("beforeCompileHtml");
 				if (\is_callable($beforeCompile)) {
 					$beforeCompile($this, $js, $view);
 				}
 			}
 			$this->callCallback($this->_preCompile);
 			unset($this->properties["jsCallback"]);
-			$this->_compiled = true;
+			$this->_compiled=true;
 		}
 	}
 
-	public function compile(JsUtils $js = NULL, &$view = NULL) {
+	public function compile(JsUtils $js=NULL, &$view=NULL) {
 		$this->compile_once($js, $view);
-		$result = $this->getTemplate($js, $view);
+		$result=$this->getTemplate($js, $view);
 		foreach ($this as $key => $value) {
-			if (\strstr($result, "%{$key}%") !== false) {
+			if (\strstr($result, "%{$key}%")!==false) {
 				if (\is_array($value)) {
-					$v = PropertyWrapper::wrap($value, $js, $view);
+					$v=PropertyWrapper::wrap($value, $js, $view);
 				} elseif ($value instanceof \stdClass) {
-					$v = \print_r($value, true);
+					$v=\print_r($value, true);
 				} elseif ($value instanceof BaseHtml) {
-					$v = $value->compile($js, $view);
+					$v=$value->compile($js, $view);
 				} else {
-					$v = $value;
+					$v=$value;
 				}
-				$result = \str_replace("%{$key}%", $v ?? '', $result);
+				$result=\str_replace("%{$key}%", $v ?? '', $result);
 			}
 		}
-		if (isset($js) === true) {
+		if (isset($js)===true) {
 			$this->run($js);
-			if (isset($view) === true) {
+			if (isset($view)===true) {
 				$js->addViewElement($this->getLibraryId(), $result, $view);
 			}
 		}
 
 		if (\is_callable($this->_postCompile)) {
-			$pc = $this->_postCompile;
+			$pc=$this->_postCompile;
 			$pc($this);
 		}
 		return $result;
@@ -247,12 +247,12 @@ 
 	 *        	default: ["jsCallback"=>"","jqueryDone"=>"append"]
 	 * @return \Ajax\common\html\BaseHtml
 	 */
-	public function setDraggable($attr = "id", $dropZone = null, $parameters = []) {
+	public function setDraggable($attr="id", $dropZone=null, $parameters=[]) {
 		$this->setProperty("draggable", "true");
 		$this->addEvent("dragstart", Javascript::draggable($attr));
 		if (isset($dropZone) && $dropZone instanceof BaseHtml) {
-			$jqueryDone = "append";
-			$jsCallback = "";
+			$jqueryDone="append";
+			$jsCallback="";
 			extract($parameters);
 			$dropZone->asDropZone($jsCallback, $jqueryDone, $parameters);
 		}
@@ -267,8 +267,8 @@ 
 	 * @param array $parameters
 	 * @return \Ajax\common\html\BaseHtml
 	 */
-	public function asDropZone($jsCallback = "", $jqueryDone = "append", $parameters = []) {
-		$stopPropagation = false;
+	public function asDropZone($jsCallback="", $jqueryDone="append", $parameters=[]) {
+		$stopPropagation=false;
 		$this->addEvent("dragover", '', $stopPropagation, true);
 		extract($parameters);
 		$this->addEvent("drop", Javascript::dropZone($jqueryDone, $jsCallback), $stopPropagation, true);
@@ -285,9 +285,9 @@ 
 	 * @param array $parameters
 	 * @return \Ajax\common\html\BaseHtml
 	 */
-	public function asFileDropZone($responseElement = null, $url = null, $progress = null, $jsCallback = "", $parameters = []) {
-		$stopPropagation = false;
-		$defaultAjaxAttributes = [
+	public function asFileDropZone($responseElement=null, $url=null, $progress=null, $jsCallback="", $parameters=[]) {
+		$stopPropagation=false;
+		$defaultAjaxAttributes=[
 			'contentType' => 'false',
 			'processData' => 'false'
 		];
@@ -295,15 +295,15 @@ 
 		extract($parameters);
 		$this->addEvent("drop", Javascript::fileDropZone($jsCallback), $stopPropagation, true);
 		if (isset($ajaxAttributes)) {
-			$ajaxAttributes += $defaultAjaxAttributes;
+			$ajaxAttributes+=$defaultAjaxAttributes;
 		} else {
-			$ajaxAttributes = $defaultAjaxAttributes;
+			$ajaxAttributes=$defaultAjaxAttributes;
 		}
 		if (isset($progress)) {
-			$progress = new HtmlProgress($this->_identifier . '-pg', 0, $progress);
+			$progress=new HtmlProgress($this->_identifier.'-pg', 0, $progress);
 			$progress->setTotal(100);
 			$this->wrap('', $progress);
-			$ajaxAttributes['upload'] = "$('#" . $this->_identifier . "-pg').progress('set percent', Math.ceil(event.loaded/event.total)*100);";
+			$ajaxAttributes['upload']="$('#".$this->_identifier."-pg').progress('set percent', Math.ceil(event.loaded/event.total)*100);";
 		}
 		if (isset($url)) {
 			$this->postOn('upload', $url, 'event.target.upload', $responseElement, $ajaxAttributes);
@@ -316,21 +316,21 @@ 
 	}
 
 	public function onPostCompile($callback) {
-		$this->_postCompile = $callback;
+		$this->_postCompile=$callback;
 	}
 
 	public function onPreCompile($callback) {
-		$this->_preCompile = $this->addCallback($this->_preCompile, $callback);
+		$this->_preCompile=$this->addCallback($this->_preCompile, $callback);
 	}
 
 	private function addCallback($originalValue, $callback) {
 		if (isset($originalValue)) {
-			if (! is_array($originalValue)) {
-				$result = [
+			if (!is_array($originalValue)) {
+				$result=[
 					$originalValue
 				];
 			}
-			$result[] = $callback;
+			$result[]=$callback;
 			return $result;
 		}
 		return $callback;

Ajax/semantic/widgets/datatable/Pagination.php

Spacing +24 added lines, -24 removed lines

@@ -12,7 +12,7 @@ 
 	private $row_count;
 	private $menu;
 
-	public function __construct($items_per_page=10,$pages_visibles=null,$page=1,$row_count=null){
+	public function __construct($items_per_page=10, $pages_visibles=null, $page=1, $row_count=null) {
 		$this->items_per_page=$items_per_page;
 		$this->row_count=$row_count;
 		$this->page=$page;
@@ -20,30 +20,30 @@ 
 		$this->visible=true;
 	}
 
-	public function getObjects($objects){
+	public function getObjects($objects) {
 		$auto=(!isset($this->row_count));
 		$os=$objects;
-		if(!\is_array($os)){
+		if (!\is_array($os)) {
 			$os=[];
-			foreach ($objects as $o){
+			foreach ($objects as $o) {
 				$os[]=$o;
 			}
 		}
-		$this->page_count = 0;
-		$row_count=($auto)?\sizeof($os):$this->row_count;
-		if (0 === $row_count) {
+		$this->page_count=0;
+		$row_count=($auto) ? \sizeof($os) : $this->row_count;
+		if (0===$row_count) {
 			$this->visible=false;
 		} else {
 
-			$this->page_count = (int)ceil($row_count / $this->items_per_page);
+			$this->page_count=(int)ceil($row_count/$this->items_per_page);
 			$this->visible=$this->page_count>1;
-			if($this->page > $this->page_count+1) {
-				$this->page = 1;
+			if ($this->page>$this->page_count+1) {
+				$this->page=1;
 			}
 		}
-		if($auto){
-			$offset = ($this->page - 1) * $this->items_per_page;
-			return array_slice($os, $offset,$this->items_per_page);
+		if ($auto) {
+			$offset=($this->page-1)*$this->items_per_page;
+			return array_slice($os, $offset, $this->items_per_page);
 		}
 		return $os;
 	}
@@ -79,28 +79,28 @@ 
 		return $this->page_count;
 	}
 
-	public function getPagesNumbers(){
-		$middle= (int)ceil(($this->pages_visibles-1)/ 2);
+	public function getPagesNumbers() {
+		$middle=(int)ceil(($this->pages_visibles-1)/2);
 		$first=$this->page-$middle;
-		if($first<1){
+		if ($first<1) {
 			$first=1;
 		}
 		$last=$first+$this->pages_visibles-1;
-		if($last>$this->page_count){
+		if ($last>$this->page_count) {
 			$last=$this->page_count;
 		}
 		return \range($first, $last);
 	}
 
 	public function setPagesVisibles($pages_visibles) {
-		if(!isset($pages_visibles))
-			$pages_visibles=(int)ceil($this->row_count / $this->items_per_page)+1;
+		if (!isset($pages_visibles))
+			$pages_visibles=(int)ceil($this->row_count/$this->items_per_page)+1;
 		$this->pages_visibles=$pages_visibles;
 		return $this;
 	}
 	
-	public function generateMenu($identifier){
-		$menu=new HtmlPaginationMenu("pagination-".$identifier,$this->getPagesNumbers());
+	public function generateMenu($identifier) {
+		$menu=new HtmlPaginationMenu("pagination-".$identifier, $this->getPagesNumbers());
 		$menu->setMax($this->page_count);
 		$menu->floatRight();
 		$menu->setActivePage($this->getPage());
@@ -114,9 +114,9 @@ 
 		return $this->menu;
 	}
 	
-	public static function getPageOfRow($rownum,$itemsPerPage=10){
-		$pageNum=0;$activeRow=0;
-		while($activeRow<$rownum){
+	public static function getPageOfRow($rownum, $itemsPerPage=10) {
+		$pageNum=0; $activeRow=0;
+		while ($activeRow<$rownum) {
 			$activeRow+=$itemsPerPage;
 			$pageNum++;
 		}

Ajax/semantic/widgets/base/FieldAsTrait.php

Spacing +116 added lines, -116 removed lines

@@ -37,7 +37,7 @@ 
  */
 trait FieldAsTrait {
 
-	abstract protected function _getFieldIdentifier($prefix, $name = "");
+	abstract protected function _getFieldIdentifier($prefix, $name="");
 
 	abstract public function setValueFunction($index, $callback);
 
@@ -45,7 +45,7 @@ 
 
 	abstract protected function _getFieldCaption($index);
 
-	abstract protected function _buttonAsSubmit(BaseHtml &$button, $event, $url, $responseElement = NULL, $parameters = NULL);
+	abstract protected function _buttonAsSubmit(BaseHtml&$button, $event, $url, $responseElement=NULL, $parameters=NULL);
 
 	private $_speProperties;
 
@@ -54,9 +54,9 @@ 
 	 * @param HtmlFormField $element
 	 * @param array $attributes
 	 */
-	protected function _applyAttributes(BaseHtml $element, &$attributes, $index, $instance = null) {
+	protected function _applyAttributes(BaseHtml $element, &$attributes, $index, $instance=null) {
 		if (isset($attributes["jsCallback"])) {
-			$callback = $attributes["jsCallback"];
+			$callback=$attributes["jsCallback"];
 			if (\is_callable($callback)) {
 				$callback($element, $instance, $index, InstanceViewer::$index);
 			}
@@ -67,15 +67,15 @@ 
 		$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(HtmlFormField $element, &$attributes) {
 		if (isset($attributes["rules"])) {
-			$this->_hasRules = true;
-			$rules = $attributes["rules"];
+			$this->_hasRules=true;
+			$rules=$attributes["rules"];
 			if (\is_array($rules)) {
 				$element->addRules($rules);
 			} else {
@@ -85,30 +85,30 @@ 
 		}
 	}
 
-	protected function _prepareFormFields(HtmlFormField &$field, $name, &$attributes) {
+	protected function _prepareFormFields(HtmlFormField&$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, $instance, $index, $rowIndex) use (&$attributes, $elementCallback, $prefix) {
-			$caption = $this->_getFieldCaption($index);
-			$name = $this->_getFieldName($index);
-			$id = $this->_getFieldIdentifier($prefix, $name);
+	protected function _fieldAs($elementCallback, &$index, $attributes=NULL, $prefix=null) {
+		$this->setValueFunction($index, function($value, $instance, $index, $rowIndex) use (&$attributes, $elementCallback, $prefix) {
+			$caption=$this->_getFieldCaption($index);
+			$name=$this->_getFieldName($index);
+			$id=$this->_getFieldIdentifier($prefix, $name);
 			if (isset($attributes["name"])) {
-				$name = $attributes["name"];
+				$name=$attributes["name"];
 				unset($attributes["name"]);
 			}
-			$element = $elementCallback($id, $name, $value, $caption);
+			$element=$elementCallback($id, $name, $value, $caption);
 			if (isset($this->_speProperties[$index])) {
-				$attributes ??= [];
-				$attributes += $this->_speProperties[$index];
+				$attributes??=[];
+				$attributes+=$this->_speProperties[$index];
 			}
 			if (\is_array($attributes)) {
 				$this->_applyAttributes($element, $attributes, $index, $instance);
 			}
-			$element->setDisabled(! $this->_edition);
+			$element->setDisabled(!$this->_edition);
 			return $element;
 		});
 		return $this;
@@ -124,48 +124,48 @@ 
 	 */
 	public function setPropertyValues($property, $indexValues) {
 		foreach ($indexValues as $index => $value) {
-			$ind = $this->_getIndex($index);
-			$this->_speProperties[$ind][$property] = $value;
+			$ind=$this->_getIndex($index);
+			$this->_speProperties[$ind][$property]=$value;
 		}
 	}
 
-	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, $attributes = NULL) {
-		return $this->_fieldAs(function ($id, $name, $value) use ($icon) {
-			$lbl = new HtmlLabel($id, $value);
+	public function fieldAsLabel($index, $icon=NULL, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value) use ($icon) {
+			$lbl=new HtmlLabel($id, $value);
 			if (isset($icon))
 				$lbl->addIcon($icon);
 			return $lbl;
 		}, $index, $attributes, "label");
 	}
 
-	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);
+	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");
 	}
 
-	public function fieldAsImage($index, $size = Size::MINI, $circular = false) {
-		$this->setValueFunction($index, function ($img) use ($size, $circular) {
-			$image = new HtmlImage($this->_getFieldIdentifier("image"), $img);
+	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();
@@ -175,65 +175,65 @@ 
 	}
 
 	public function fieldAsFlag($index) {
-		$this->setValueFunction($index, function ($flag) {
-			$flag = new HtmlFlag($this->_getFieldIdentifier("flag"), $flag);
+		$this->setValueFunction($index, function($flag) {
+			$flag=new HtmlFlag($this->_getFieldIdentifier("flag"), $flag);
 			return $flag;
 		});
 		return $this;
 	}
 
 	public function fieldAsIcon($index) {
-		$this->setValueFunction($index, function ($icon) {
-			$icon = new HtmlIcon($this->_getFieldIdentifier("icon"), $icon);
+		$this->setValueFunction($index, function($icon) {
+			$icon=new HtmlIcon($this->_getFieldIdentifier("icon"), $icon);
 			return $icon;
 		});
 		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");
 	}
 
-	public function fieldAsRadio($index, $attributes = NULL) {
-		return $this->_fieldAs(function ($id, $name, $value) use ($attributes) {
-			$input = new HtmlFormRadio($id, $name, $value, $value);
+	public function fieldAsRadio($index, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value) use ($attributes) {
+			$input=new HtmlFormRadio($id, $name, $value, $value);
 			return $this->_prepareFormFields($input, $name, $attributes);
 		}, $index, $attributes, "radio");
 	}
 
-	public function fieldAsRadios($index, $elements = [], $attributes = NULL) {
-		return $this->_fieldAs(function ($id, $name, $value, $caption) use ($elements) {
+	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 fieldAsList($index, $classNames = "", $attributes = NULL) {
-		return $this->_fieldAs(function ($id, $name, $value, $caption) use ($classNames) {
-			$result = new HtmlList($name, $value);
+	public function fieldAsList($index, $classNames="", $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) use ($classNames) {
+			$result=new HtmlList($name, $value);
 			$result->addClass($classNames);
 			return $result;
 		}, $index, $attributes, "list");
 	}
 
-	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");
 	}
 
-	public function fieldAsLabeledInput($index, $attributes = NULL) {
-		return $this->_fieldAs(function ($id, $name, $value, $caption) use ($attributes) {
-			$input = new HtmlFormInput($id, '', 'text', $value, $caption);
-			$required = '';
+	public function fieldAsLabeledInput($index, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) use ($attributes) {
+			$input=new HtmlFormInput($id, '', 'text', $value, $caption);
+			$required='';
 			if (isset($attributes['rules'])) {
-				$rules = json_encode($attributes['rules']);
-				if (strpos($rules, 'empty') !== false) {
-					$required = 'required';
+				$rules=json_encode($attributes['rules']);
+				if (strpos($rules, 'empty')!==false) {
+					$required='required';
 				}
 			}
 			$input->getField()
@@ -244,80 +244,80 @@ 
 		}, $index, $attributes, 'input');
 	}
 
-	public function fieldAsDataList($index, ?array $items = [], $attributes = NULL) {
-		return $this->_fieldAs(function ($id, $name, $value, $caption) use ($attributes, $items) {
-			$input = new HtmlFormInput($id, $caption, "text", $value);
+	public function fieldAsDataList($index, ?array $items=[], $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) use ($attributes, $items) {
+			$input=new HtmlFormInput($id, $caption, "text", $value);
 			$input->getField()
 				->addDataList($items);
 			return $this->_prepareFormFields($input, $name, $attributes);
 		}, $index, $attributes, "input");
 	}
 
-	public function fieldAsFile($index, $attributes = NULL) {
+	public function fieldAsFile($index, $attributes=NULL) {
 		if (isset($this->_form)) {
 			$this->_form->setProperty('enctype', 'multipart/form-data');
 		}
-		return $this->_fieldAs(function ($id, $name, $value, $caption) use ($attributes) {
-			$input = new HtmlFormInput($id, $caption);
+		return $this->_fieldAs(function($id, $name, $value, $caption) use ($attributes) {
+			$input=new HtmlFormInput($id, $caption);
 			$input->asFile();
 			return $this->_prepareFormFields($input, $name, $attributes);
 		}, $index, $attributes, "input");
 	}
 
-	public function fieldAsTextarea($index, $attributes = NULL) {
-		return $this->_fieldAs(function ($id, $name, $value, $caption) use ($attributes) {
-			$textarea = new HtmlFormTextarea($id, $caption, $value);
+	public function fieldAsTextarea($index, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) use ($attributes) {
+			$textarea=new HtmlFormTextarea($id, $caption, $value);
 			return $this->_prepareFormFields($textarea, $name, $attributes);
 		}, $index, $attributes, "textarea");
 	}
 
-	public function fieldAsElement($index, $tagName = "div", $baseClass = "", $attributes = NULL) {
-		return $this->_fieldAs(function ($id, $name, $value, $caption) use ($attributes, $tagName, $baseClass) {
-			$div = new HtmlSemDoubleElement($id, $tagName, $baseClass);
+	public function fieldAsElement($index, $tagName="div", $baseClass="", $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) use ($attributes, $tagName, $baseClass) {
+			$div=new HtmlSemDoubleElement($id, $tagName, $baseClass);
 			$div->setContent(\htmlentities($value));
-			$textarea = new HtmlFormField("field-" . $id, $div, $caption);
+			$textarea=new HtmlFormField("field-".$id, $div, $caption);
 			return $this->_prepareFormFields($textarea, $name, $attributes);
 		}, $index, $attributes, "element");
 	}
 
-	public function fieldAsHidden($index, $attributes = NULL) {
-		if (! \is_array($attributes)) {
-			$attributes = [];
+	public function fieldAsHidden($index, $attributes=NULL) {
+		if (!\is_array($attributes)) {
+			$attributes=[];
 		}
-		$attributes["inputType"] = "hidden";
-		$attributes["style"] = "display:none;";
+		$attributes["inputType"]="hidden";
+		$attributes["style"]="display:none;";
 		return $this->fieldAsInput($index, $attributes);
 	}
 
-	public function fieldAsCheckbox($index, $attributes = NULL) {
-		return $this->_fieldAs(function ($id, $name, $value, $caption) use ($attributes) {
-			if ($caption === null || $caption === "")
-				$caption = "";
-			$input = new HtmlFormCheckbox($id, $caption, $this->_instanceViewer->getIdentifier());
+	public function fieldAsCheckbox($index, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) use ($attributes) {
+			if ($caption===null || $caption==="")
+				$caption="";
+			$input=new HtmlFormCheckbox($id, $caption, $this->_instanceViewer->getIdentifier());
 			$input->setChecked(JString::isBooleanTrue($value));
 			return $this->_prepareFormFields($input, $name, $attributes);
 		}, $index, $attributes, "ck");
 	}
 
-	public function fieldAsDropDown($index, $elements = [], $multiple = false, $attributes = NULL) {
-		return $this->_fieldAs(function ($id, $name, $value, $caption) use ($elements, $multiple, $attributes) {
-			$dd = new HtmlFormDropdown($id, $elements, $caption, $value ?? '');
+	public function fieldAsDropDown($index, $elements=[], $multiple=false, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) use ($elements, $multiple, $attributes) {
+			$dd=new HtmlFormDropdown($id, $elements, $caption, $value ?? '');
 			$dd->asSelect($name, $multiple);
 			return $this->_prepareFormFields($dd, $name, $attributes);
 		}, $index, $attributes, "dd");
 	}
 
-	public function fieldAsMessage($index, $attributes = NULL) {
-		return $this->_fieldAs(function ($id, $name, $value, $caption) {
-			$mess = new HtmlMessage("message-" . $id, $caption);
+	public function fieldAsMessage($index, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) {
+			$mess=new HtmlMessage("message-".$id, $caption);
 			$mess->addHeader($value);
 			return $mess;
 		}, $index, $attributes, "message");
 	}
 
-	public function fieldAsLink($index, $attributes = NULL) {
-		return $this->_fieldAs(function ($id, $name, $value, $caption) {
-			$lnk = new HtmlLink("message-" . $id, "#", $caption);
+	public function fieldAsLink($index, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) {
+			$lnk=new HtmlLink("message-".$id, "#", $caption);
 			return $lnk;
 		}, $index, $attributes, "link");
 	}
@@ -329,28 +329,28 @@ 
 	 *        	an array or associative array $type=>$attributes
 	 */
 	public function fieldsAs(array $types) {
-		$i = 0;
+		$i=0;
 		if (JArray::isAssociative($types)) {
 			foreach ($types as $type => $attributes) {
 				if (\is_int($type))
-					$this->fieldAs($i ++, $attributes, []);
+					$this->fieldAs($i++, $attributes, []);
 				else {
-					$type = preg_replace('/\d/', '', $type);
-					$this->fieldAs($i ++, $type, $attributes);
+					$type=preg_replace('/\d/', '', $type);
+					$this->fieldAs($i++, $type, $attributes);
 				}
 			}
 		} else {
 			foreach ($types as $type) {
-				$this->fieldAs($i ++, $type);
+				$this->fieldAs($i++, $type);
 			}
 		}
 	}
 
-	public function fieldAs($index, $type, $attributes = NULL) {
-		$method = "fieldAs" . \ucfirst($type);
+	public function fieldAs($index, $type, $attributes=NULL) {
+		$method="fieldAs".\ucfirst($type);
 		if (\method_exists($this, $method)) {
-			if (! \is_array($attributes)) {
-				$attributes = [
+			if (!\is_array($attributes)) {
+				$attributes=[
 					$index
 				];
 			} else {
@@ -363,39 +363,39 @@ 
 		}
 	}
 
-	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, $caption, $cssStyle);
+	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, $caption, $cssStyle);
 			$this->_buttonAsSubmit($button, "click", $url, $responseElement, $attributes["ajax"] ?? []);
 			return $button;
 		}, $index, $attributes, "submit");
 	}
 
-	public function fieldAsButton($index, $cssStyle = NULL, $attributes = NULL) {
-		return $this->_fieldAs(function ($id, $name, $value, $caption) use ($cssStyle) {
-			$button = new HtmlButton($id, $value, $cssStyle);
+	public function fieldAsButton($index, $cssStyle=NULL, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) use ($cssStyle) {
+			$button=new HtmlButton($id, $value, $cssStyle);
 			return $button;
 		}, $index, $attributes, "button");
 	}
 
-	public function fieldAsDataTable($index, $model, $instances = null, $fields = [], $attributes = NULL) {
-		return $this->_fieldAs(function ($id, $name, $value, $caption) use ($model, $instances, $fields, $index) {
-			$dt = new DataTable($id, $model, $instances);
+	public function fieldAsDataTable($index, $model, $instances=null, $fields=[], $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) use ($model, $instances, $fields, $index) {
+			$dt=new DataTable($id, $model, $instances);
 			$dt->setNamePrefix($index);
 			$dt->setFields($fields);
 			$dt->setEdition(true);
-			$dt->addDeleteButton(false, [], function ($bt) use ($index) {
+			$dt->addDeleteButton(false, [], function($bt) use ($index) {
 				$bt->addClass('mini circular')
-					->wrap('<input value="" class="_status" type="hidden" name="' . $index . '._status[]">');
+					->wrap('<input value="" class="_status" type="hidden" name="'.$index.'._status[]">');
 			});
-			if ($caption != null) {
+			if ($caption!=null) {
 				$dt->setFormCaption($caption);
 			}
-			$dt->onPreCompile(function () use (&$dt) {
+			$dt->onPreCompile(function() use (&$dt) {
 				$dt->getHtmlComponent()
 					->colRightFromRight(0);
 			});
-			$dt->wrap('<input type="hidden" name="' . $index . '">');
+			$dt->wrap('<input type="hidden" name="'.$index.'">');
 			return $dt;
 		}, $index, $attributes, "dataTable");
 	}

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

Spacing +44 added lines, -44 removed lines

@@ -22,7 +22,7 @@ 
 
 	public function __construct($identifier) {
 		parent::__construct($identifier, "tr", "");
-		$this->_states = [
+		$this->_states=[
 			State::ACTIVE,
 			State::POSITIVE,
 			State::NEGATIVE,
@@ -33,9 +33,9 @@ 
 	}
 
 	public function setColCount($colCount) {
-		$count = $this->count();
-		for ($i = $count; $i < $colCount; $i ++) {
-			$item = $this->addItem(NULL);
+		$count=$this->count();
+		for ($i=$count; $i<$colCount; $i++) {
+			$item=$this->addItem(NULL);
 			$item->setTagName($this->_tdTagName);
 		}
 		return $this;
@@ -52,8 +52,8 @@ 
 	 * @see \Ajax\common\html\HtmlCollection::createItem()
 	 */
 	protected function createItem($value) {
-		$count = $this->count();
-		$td = new HtmlTD("", $value, $this->_tdTagName);
+		$count=$this->count();
+		$td=new HtmlTD("", $value, $this->_tdTagName);
 		$td->setContainer($this->_container, $this->_row, $count);
 		return $td;
 	}
@@ -66,8 +66,8 @@ 
 		return parent::getItem($index);
 	}
 
-	public function setTdTagName($tagName = "td") {
-		$this->_tdTagName = $tagName;
+	public function setTdTagName($tagName="td") {
+		$this->_tdTagName=$tagName;
 	}
 
 	/**
@@ -77,8 +77,8 @@ 
 	 * @param int $row
 	 */
 	public function setContainer($container, $row) {
-		$this->_container = $container;
-		$this->_row = $row;
+		$this->_container=$container;
+		$this->_row=$row;
 	}
 
 	/**
@@ -86,8 +86,8 @@ 
 	 *
 	 * @param mixed $values
 	 */
-	public function setValues($values = array()) {
-		return $this->_addOrSetValues($values, function (HtmlTD &$cell, $value) {
+	public function setValues($values=array()) {
+		return $this->_addOrSetValues($values, function(HtmlTD&$cell, $value) {
 			$cell->setValue($value);
 		});
 	}
@@ -97,8 +97,8 @@ 
 	 *
 	 * @param mixed $values
 	 */
-	public function addValues($values = array()) {
-		return $this->_addOrSetValues($values, function (HtmlTD &$cell, $value) {
+	public function addValues($values=array()) {
+		return $this->_addOrSetValues($values, function(HtmlTD&$cell, $value) {
 			$cell->addValue($value);
 		});
 	}
@@ -109,18 +109,18 @@ 
 	 * @param mixed $values
 	 */
 	protected function _addOrSetValues($values, $callback) {
-		$count = $this->count();
-		if (! \is_array($values)) {
-			$values = \array_fill(0, $count, $values);
+		$count=$this->count();
+		if (!\is_array($values)) {
+			$values=\array_fill(0, $count, $values);
 		} else {
-			if (JArray::isAssociative($values) === true) {
-				$values = \array_values($values);
+			if (JArray::isAssociative($values)===true) {
+				$values=\array_values($values);
 			}
 		}
-		$count = \min(\sizeof($values), $count);
+		$count=\min(\sizeof($values), $count);
 
-		for ($i = 0; $i < $count; $i ++) {
-			$cell = $this->content[$i];
+		for ($i=0; $i<$count; $i++) {
+			$cell=$this->content[$i];
 			$callback($cell, $values[$i]);
 		}
 		return $this;
@@ -138,12 +138,12 @@ 
 		return $this;
 	}
 
-	public function mergeCol($colIndex = 0) {
+	public function mergeCol($colIndex=0) {
 		return $this->getItem($colIndex)->mergeCol();
 	}
 
-	public function mergeRow($colIndex = 0) {
-		$row = $this->getItem($colIndex);
+	public function mergeRow($colIndex=0) {
+		$row=$this->getItem($colIndex);
 		if (isset($row)) {
 			$this->getItem($colIndex)->mergeRow();
 		}
@@ -151,31 +151,31 @@ 
 	}
 
 	public function getColPosition($colIndex) {
-		if ($this->_container->_isMerged() !== true)
+		if ($this->_container->_isMerged()!==true)
 			return $colIndex;
-		$pos = 0;
-		$rows = $this->_container->getContent();
-		for ($i = 0; $i < $this->_row; $i ++) {
-			$max = \min($colIndex, $rows[$i]->count());
-			for ($j = 0; $j < $max; $j ++) {
-				$rowspan = $rows[$i]->getItem($j)->getRowspan();
-				if ($rowspan + $i > $this->_row)
-					$pos ++;
+		$pos=0;
+		$rows=$this->_container->getContent();
+		for ($i=0; $i<$this->_row; $i++) {
+			$max=\min($colIndex, $rows[$i]->count());
+			for ($j=0; $j<$max; $j++) {
+				$rowspan=$rows[$i]->getItem($j)->getRowspan();
+				if ($rowspan+$i>$this->_row)
+					$pos++;
 			}
 		}
-		if ($pos > $colIndex)
+		if ($pos>$colIndex)
 			return NULL;
-		$count = $this->count();
-		for ($i = 0; $i < $count; $i ++) {
-			$pos += $this->content[$i]->getColspan();
-			if ($pos >= $colIndex + 1)
+		$count=$this->count();
+		for ($i=0; $i<$count; $i++) {
+			$pos+=$this->content[$i]->getColspan();
+			if ($pos>=$colIndex+1)
 				return $i;
 		}
 		return null;
 	}
 
 	public function conditionalCellFormat($callback, $format) {
-		$cells = $this->content;
+		$cells=$this->content;
 		foreach ($cells as $cell) {
 			$cell->conditionalCellFormat($callback, $format);
 		}
@@ -190,9 +190,9 @@ 
 	}
 
 	public function containsStr($needle) {
-		$cells = $this->content;
+		$cells=$this->content;
 		foreach ($cells as $cell) {
-			if (\strpos($cell->getContent(), $needle) !== false)
+			if (\strpos($cell->getContent(), $needle)!==false)
 				return true;
 		}
 		return false;
@@ -204,7 +204,7 @@ 
 	}
 
 	public function applyCells($callback) {
-		$cells = $this->content;
+		$cells=$this->content;
 		foreach ($cells as $cell) {
 			$cell->apply($callback);
 		}
@@ -217,7 +217,7 @@ 
 	}
 
 	public function toRowspanned($colIndex) {
-		$cell = $this->getItem($colIndex);
+		$cell=$this->getItem($colIndex);
 		$cell->addClass('rowspanned');
 		$cell->setContent('');
 		return $this;

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

Spacing +46 added lines, -46 removed lines

@@ -15,7 +15,7 @@ 
  * @author jc
  *
  */
-trait FormTrait{
+trait FormTrait {
 
 	/**
 	 * @return HtmlForm
@@ -23,23 +23,23 @@ 
 	abstract protected function getForm();
 	
 
-	protected function addCompoValidation(Form $compo,HtmlFormField $field){
+	protected function addCompoValidation(Form $compo, HtmlFormField $field) {
 		$validation=$field->getValidation();
-		if(isset($validation)){
+		if (isset($validation)) {
 			$validation->setIdentifier($field->getDataField()->getIdentifier());
 			$compo->addFieldValidation($validation);
 		}
 	}
 	
-	protected function addExtraCompoValidation(Form $compo,FieldValidation $validation){
+	protected function addExtraCompoValidation(Form $compo, FieldValidation $validation) {
 		$compo->addFieldValidation($validation);
 	}
 
-	protected function _runValidationParams(Form &$compo,JsUtils $js=NULL){
+	protected function _runValidationParams(Form&$compo, JsUtils $js=NULL) {
 		$form=$this->getForm();
 		$params=$form->getValidationParams();
-		if(isset($params["_ajaxSubmit"])){
-			$compilation=$this->_compileAjaxSubmit($params["_ajaxSubmit"],$js);
+		if (isset($params["_ajaxSubmit"])) {
+			$compilation=$this->_compileAjaxSubmit($params["_ajaxSubmit"], $js);
 			$this->onSuccess($compilation);
 			$form->removeValidationParam("_ajaxSubmit");
 		}
@@ -48,16 +48,16 @@ 
 		$form->addEventsOnRun($js);
 	}
 
-	protected function _compileAjaxSubmit($ajaxSubmit,JsUtils $js=null){
+	protected function _compileAjaxSubmit($ajaxSubmit, JsUtils $js=null) {
 		$compilation="";
-		if(\is_array($ajaxSubmit)){
-			foreach ($ajaxSubmit as $ajaxSubmitItem){
+		if (\is_array($ajaxSubmit)) {
+			foreach ($ajaxSubmit as $ajaxSubmitItem) {
 				$compilation.=$ajaxSubmitItem->compile($js);
 			}
-		}elseif($ajaxSubmit instanceof AjaxCall){
+		}elseif ($ajaxSubmit instanceof AjaxCall) {
 			$compilation=$ajaxSubmit->compile($js);
 		}
-		$compilation=str_ireplace("\"","%quote%", $compilation);
+		$compilation=str_ireplace("\"", "%quote%", $compilation);
 		return $compilation;
 	}
 
@@ -70,14 +70,14 @@ 
 		return $this;
 	}
 
-	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());
 	}
 
@@ -93,48 +93,48 @@ 
 	 * @param array $parameters
 	 * @return HtmlForm
 	 */
-	public function submitOn($event,$identifierOrElement,$url,$responseElement,$parameters=NULL){
+	public function submitOn($event, $identifierOrElement, $url, $responseElement, $parameters=NULL) {
 		$form=$this->getForm();
-		if($identifierOrElement  instanceof BaseHtml)
+		if ($identifierOrElement  instanceof BaseHtml)
 			$elem=$identifierOrElement;
 		else
 			$elem=$form->getElementById($identifierOrElement, $form->getContent());
-		if(isset($elem)){
-			$this->_buttonAsSubmit($elem, $event,$url,$responseElement,$parameters);
+		if (isset($elem)) {
+			$this->_buttonAsSubmit($elem, $event, $url, $responseElement, $parameters);
 		}
 		return $form;
 	}
 
-	public function submitOnClick($identifier,$url,$responseElement,$parameters=NULL){
-		return $this->submitOn("click", $identifier, $url, $responseElement,$parameters);
+	public function submitOnClick($identifier, $url, $responseElement, $parameters=NULL) {
+		return $this->submitOn("click", $identifier, $url, $responseElement, $parameters);
 	}
 
-	public function addSubmit($identifier,$value,$cssStyle=NULL,$url=NULL,$responseElement=NULL,$parameters=NULL){
-		$bt=$this->getForm()->addButton($identifier, $value,$cssStyle);
-		return $this->_buttonAsSubmit($bt, "click",$url,$responseElement,$parameters);
+	public function addSubmit($identifier, $value, $cssStyle=NULL, $url=NULL, $responseElement=NULL, $parameters=NULL) {
+		$bt=$this->getForm()->addButton($identifier, $value, $cssStyle);
+		return $this->_buttonAsSubmit($bt, "click", $url, $responseElement, $parameters);
 	}
 
-	protected function _buttonAsSubmit(BaseHtml &$button,$event,$url,$responseElement=NULL,$parameters=NULL){
+	protected function _buttonAsSubmit(BaseHtml&$button, $event, $url, $responseElement=NULL, $parameters=NULL) {
 		$form=$this->getForm();
-		if(isset($url) && isset($responseElement)){
-			$button->addEvent($event, "$('#".$form->getIdentifier()."').form('validate form');",true,true);
-			$this->setSubmitParams($url,$responseElement,$parameters);
+		if (isset($url) && isset($responseElement)) {
+			$button->addEvent($event, "$('#".$form->getIdentifier()."').form('validate form');", true, true);
+			$this->setSubmitParams($url, $responseElement, $parameters);
 		}
 		return $button;
 	}
 
-	public function setSubmitParams($url,$responseElement=NULL,$parameters=NULL){
+	public function setSubmitParams($url, $responseElement=NULL, $parameters=NULL) {
 		$form=$this->getForm();
-		$params=["form"=>$form->getIdentifier(),"responseElement"=>$responseElement,"url"=>$url,"stopPropagation"=>true];
-		if(\is_array($parameters)){
-			$params=\array_merge($params,$parameters);
+		$params=["form"=>$form->getIdentifier(), "responseElement"=>$responseElement, "url"=>$url, "stopPropagation"=>true];
+		if (\is_array($parameters)) {
+			$params=\array_merge($params, $parameters);
 		}
 		$form->addValidationParam("_ajaxSubmit", new AjaxCall("postForm", $params));
 		return $this;
 	}
 
-	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;
 	}
@@ -144,7 +144,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;
@@ -155,35 +155,35 @@ 
 	 * @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", $jsCode,"%function(event,fields){","}%");
+		$form->addValidationParam("onSuccess", $jsCode, "%function(event,fields){", "}%");
 		return $form;
 	}
 	
-	public function addExtraFieldRules($fieldname,$rules){
+	public function addExtraFieldRules($fieldname, $rules) {
 		$form=$this->getForm();
 		$fv=$form->getExtraFieldValidation($fieldname);
-		foreach ($rules as $rule){
+		foreach ($rules as $rule) {
 			$fv->addRule($rule);
 		}
 	}
 	
-	public function addExtraFieldRule($fieldname,$type,$prompt=NULL,$value=NULL){
+	public function addExtraFieldRule($fieldname, $type, $prompt=NULL, $value=NULL) {
 		$form=$this->getForm();
 		$fv=$form->getExtraFieldValidation($fieldname);
-		$fv->addRule($type,$prompt,$value);
+		$fv->addRule($type, $prompt, $value);
 	}
 	
-	public function setOptional($fieldname,$optional=true){
+	public function setOptional($fieldname, $optional=true) {
 		$form=$this->getForm();
 		$fv=$form->getExtraFieldValidation($fieldname);
 		$fv->setOptional($optional);
 	}
 
-	public function setActionTarget(string $action, string $target){
+	public function setActionTarget(string $action, string $target) {
 		$form=$this->getForm();
-		$form->setProperty('data-target',$target);
-		$form->setProperty('action',$action);
+		$form->setProperty('data-target', $target);
+		$form->setProperty('action', $action);
 	}
 }

Ajax/semantic/html/collections/menus/HtmlMenu.php

Spacing +31 added lines, -31 removed lines

@@ -41,12 +41,12 @@ 
 	 * @return HtmlMenu
 	 */
 	public function setType($type="") {
-		return $this->addToPropertyCtrl("class", $type, array ("","item","text" ));
+		return $this->addToPropertyCtrl("class", $type, array("", "item", "text"));
 	}
 
 	public function setActiveItem($index) {
 		$item=$this->getItem($index);
-		if ($item !== null) {
+		if ($item!==null) {
 			$item->addToProperty("class", "active");
 		}
 		return $this;
@@ -54,7 +54,7 @@ 
 
 	private function getItemToInsert($item) {
 		if ($item instanceof HtmlInput || $item instanceof HtmlImg || $item instanceof HtmlIcon || $item instanceof HtmlButtonGroups || $item instanceof HtmlButton || $item instanceof HtmlLabel) {
-			$itemO=new HtmlMenuItem("item-" . $this->identifier . "-" . \sizeof($this->content) , $item);
+			$itemO=new HtmlMenuItem("item-".$this->identifier."-".\sizeof($this->content), $item);
 			$itemO->addClass("no-active");
 			$item=$itemO;
 		}
@@ -63,7 +63,7 @@ 
 
 	private function afterInsert($item) {
 		if (!$item instanceof HtmlMenu && $item->propertyContains("class", "header")===false)
-			$item->addToPropertyCtrl("class", "item", array ("item" ));
+			$item->addToPropertyCtrl("class", "item", array("item"));
 		else {
 			$this->setSecondary();
 		}
@@ -79,7 +79,7 @@ 
 	public function addItem($item) {
 		$number=$item;
 		$item=parent::addItem($this->getItemToInsert($item));
-		if(\is_int($number))
+		if (\is_int($number))
 			$item->setProperty("data-page", $number);
 		return $this->afterInsert($item);
 	}
@@ -97,15 +97,15 @@ 
 
 	public function generateMenuAsItem($menu, $header=null) {
 		$count=$this->count();
-		$item=new HtmlSemDoubleElement("item-" . $this->identifier . "-" . $count, "div");
+		$item=new HtmlSemDoubleElement("item-".$this->identifier."-".$count, "div");
 		if (isset($header)) {
-			$headerItem=new HtmlSemDoubleElement("item-header-" . $this->identifier . "-" . $count, "div", "header");
+			$headerItem=new HtmlSemDoubleElement("item-header-".$this->identifier."-".$count, "div", "header");
 			$headerItem->setContent($header);
 			$item->addContent($headerItem);
 			$this->_itemHeader=$headerItem;
 		}
-		if(\is_array($menu)){
-			$menu=new HtmlMenu("menu-" . $this->identifier . "-" . $count,$menu);
+		if (\is_array($menu)) {
+			$menu=new HtmlMenu("menu-".$this->identifier."-".$count, $menu);
 		}
 		$menu->setClass("menu");
 		$item->addContent($menu);
@@ -117,11 +117,11 @@ 
 	 * @param String|HtmlDoubleElement $caption
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
-	public function addHeader($caption){
-		if(!($caption instanceof HtmlDoubleElement)){
-			$header=new HtmlDoubleElement('','div');
+	public function addHeader($caption) {
+		if (!($caption instanceof HtmlDoubleElement)) {
+			$header=new HtmlDoubleElement('', 'div');
 			$header->setContent($caption);
-		}else{
+		} else {
 			$header=$caption;
 		}
 		$header->addClass('item header');
@@ -137,7 +137,7 @@ 
 		$value=new HtmlSemDoubleElement($identifier, "a", "browse item", $value);
 		$value->addContent(new HtmlIcon("", "dropdown"));
 		$value=$this->addItem($value);
-		$popup=new HtmlPopup($value, "popup-" . $this->identifier . "-" . $this->count(), $content);
+		$popup=new HtmlPopup($value, "popup-".$this->identifier."-".$this->count(), $content);
 		$popup->setFlowing()->setPosition("bottom left")->setOn("click");
 		$this->wrap("", $popup);
 		return $popup;
@@ -146,7 +146,7 @@ 
 	public function addDropdownAsItem($value, $items=NULL) {
 		$dd=$value;
 		if (\is_string($value)) {
-			$dd=new HtmlDropdown("dropdown-" . $this->identifier . "-" . $this->count(), $value, $items);
+			$dd=new HtmlDropdown("dropdown-".$this->identifier."-".$this->count(), $value, $items);
 		}
 		$this->addItem($dd);
 		return $dd;
@@ -159,14 +159,14 @@ 
 	 * @see HtmlCollection::createItem()
 	 */
 	protected function createItem($value) {
-		$itemO=new HtmlMenuItem($this->identifier."-item-" . \sizeof($this->content),"");
+		$itemO=new HtmlMenuItem($this->identifier."-item-".\sizeof($this->content), "");
 		$itemO->setTagName("a");
 		$itemO->setContent($value);
 		return $itemO;
 	}
 
 	public function setSecondary($value=true) {
-		if($value)
+		if ($value)
 			$this->addToProperty("class", "secondary");
 		else
 			$this->removePropertyValue("class", "secondary");
@@ -174,28 +174,28 @@ 
 	}
 
 	public function setVertical() {
-		return $this->addToPropertyCtrl("class", "vertical", array ("vertical" ));
+		return $this->addToPropertyCtrl("class", "vertical", array("vertical"));
 	}
 
 	public function setPosition($value="right") {
-		return $this->addToPropertyCtrl("class", $value, array ("right","left" ));
+		return $this->addToPropertyCtrl("class", $value, array("right", "left"));
 	}
 
 	public function setPointing($value=Direction::NONE) {
-		return $this->addToPropertyCtrl("class", $value . " pointing", Direction::getConstantValues("pointing"));
+		return $this->addToPropertyCtrl("class", $value." pointing", Direction::getConstantValues("pointing"));
 	}
 
 	public function asTab($vertical=false) {
-		$this->apply(function (HtmlDoubleElement &$item) {
+		$this->apply(function(HtmlDoubleElement&$item) {
 			$item->setTagName("a");
 		});
-		if ($vertical === true)
+		if ($vertical===true)
 			$this->setVertical();
 		return $this->addToProperty("class", "tabular");
 	}
 
 	public function asPagination() {
-		$this->apply(function (HtmlDoubleElement &$item) {
+		$this->apply(function(HtmlDoubleElement&$item) {
 			$item->setTagName("a");
 		});
 		return $this->addToProperty("class", "pagination");
@@ -232,10 +232,10 @@ 
 	 */
 	public function setWidth($width) {
 		if (\is_int($width)) {
-			$width=Wide::getConstants()["W" . $width];
+			$width=Wide::getConstants()["W".$width];
 		}
 		$this->addToPropertyCtrl("class", $width, Wide::getConstants());
-		return $this->addToPropertyCtrl("class", "item", array ("item" ));
+		return $this->addToPropertyCtrl("class", "item", array("item"));
 	}
 
 	public function addImage($identifier, $src="", $alt="") {
@@ -250,14 +250,14 @@ 
 		return $this->_itemHeader;
 	}
 
-	public function setHasContainer(){
-		return $this->wrapContent("<div class='ui container'>","</div>");
+	public function setHasContainer() {
+		return $this->wrapContent("<div class='ui container'>", "</div>");
 	}
 
-	public function run(JsUtils $js){
-		if($this->identifier!=="" && !isset($this->_bsComponent))
-			$this->onClick('if(!$(this).hasClass("dropdown")&&!$(this).hasClass("no-active")){$(this).addClass("active").siblings().removeClass("active");}',false,false);
-		$result= parent::run($js);
+	public function run(JsUtils $js) {
+		if ($this->identifier!=="" && !isset($this->_bsComponent))
+			$this->onClick('if(!$(this).hasClass("dropdown")&&!$(this).hasClass("no-active")){$(this).addClass("active").siblings().removeClass("active");}', false, false);
+		$result=parent::run($js);
 		return $result->setItemSelector(">.item:not(.header)");
 	}
 }

Ajax/semantic/components/validation/Rule.php

Spacing +49 added lines, -49 removed lines

@@ -8,7 +8,7 @@ 
  * @version 1.001
  * Generates a JSON Rule for the validation of a field
  */
-class Rule implements \JsonSerializable{
+class Rule implements \JsonSerializable {
 	/**
 	 * @var string
 	 */
@@ -23,7 +23,7 @@ 
 	 */
 	private $value;
 
-	public function __construct($type,$prompt=NULL,$value=NULL){
+	public function __construct($type, $prompt=NULL, $value=NULL) {
 		$this->type=$type;
 		$this->prompt=$prompt;
 		$this->value=$value;
@@ -58,10 +58,10 @@ 
 
 	#[\ReturnTypeWillChange]
 	public function jsonSerialize() {
-		$result= ["type"=>$this->type];
-		if(isset($this->prompt))
+		$result=["type"=>$this->type];
+		if (isset($this->prompt))
 			$result["prompt"]=$this->prompt;
-		if(isset($this->value))
+		if (isset($this->value))
 			$result["value"]=$this->value;
 		return $result;
 	}
@@ -72,8 +72,8 @@ 
 	 * @param string $prompt
 	 * @return \Ajax\semantic\components\validation\Rule
 	 */
-	public static function match($name,$prompt=NULL){
-		return new Rule("match[".$name."]",$prompt);
+	public static function match($name, $prompt=NULL){
+		return new Rule("match[".$name."]", $prompt);
 	}
 
 	/**
@@ -82,8 +82,8 @@ 
 	 * @param string $prompt
 	 * @return \Ajax\semantic\components\validation\Rule
 	 */
-	public static function different($name,$prompt=NULL){
-		return new Rule("different[".$name."]",$prompt);
+	public static function different($name, $prompt=NULL) {
+		return new Rule("different[".$name."]", $prompt);
 	}
 
 	/**
@@ -93,82 +93,82 @@ 
 	 * @param string $prompt
 	 * @return \Ajax\semantic\components\validation\Rule
 	 */
-	public static function integer($min=NULL,$max=NULL,$prompt=NULL){
-		if(\is_int($min) && \is_int($max))
-			return new Rule("integer[{$min}..{$max}]",$prompt);
-		return new Rule("integer",$prompt);
+	public static function integer($min=NULL, $max=NULL, $prompt=NULL) {
+		if (\is_int($min) && \is_int($max))
+			return new Rule("integer[{$min}..{$max}]", $prompt);
+		return new Rule("integer", $prompt);
 	}
 
-	public static function decimal($prompt=NULL){
-		return new Rule("decimal",$prompt);
+	public static function decimal($prompt=NULL) {
+		return new Rule("decimal", $prompt);
 	}
 
-	public static function number($prompt=NULL){
-		return new Rule("number",$prompt);
+	public static function number($prompt=NULL) {
+		return new Rule("number", $prompt);
 	}
 
-	public static function is($value,$prompt=NULL){
-		return new Rule("is[".$value."]",$prompt);
+	public static function is($value, $prompt=NULL) {
+		return new Rule("is[".$value."]", $prompt);
 	}
 
-	public static function isExactly($value,$prompt=NULL){
-		return new Rule("isExactly[".$value."]",$prompt);
+	public static function isExactly($value, $prompt=NULL) {
+		return new Rule("isExactly[".$value."]", $prompt);
 	}
 
-	public static function not($value,$prompt=NULL){
-		return new Rule("not[".$value."]",$prompt);
+	public static function not($value, $prompt=NULL) {
+		return new Rule("not[".$value."]", $prompt);
 	}
 
-	public static function notExactly($value,$prompt=NULL){
-		return new Rule("notExactly[".$value."]",$prompt);
+	public static function notExactly($value, $prompt=NULL) {
+		return new Rule("notExactly[".$value."]", $prompt);
 	}
 
-	public static function contains($value,$prompt=NULL){
-		return new Rule("contains[".$value."]",$prompt);
+	public static function contains($value, $prompt=NULL) {
+		return new Rule("contains[".$value."]", $prompt);
 	}
 
-	public static function containsExactly($value,$prompt=NULL){
-		return new Rule("containsExactly[".$value."]",$prompt);
+	public static function containsExactly($value, $prompt=NULL) {
+		return new Rule("containsExactly[".$value."]", $prompt);
 	}
 
-	public static function doesntContain($value,$prompt=NULL){
-		return new Rule("doesntContain[".$value."]",$prompt);
+	public static function doesntContain($value, $prompt=NULL) {
+		return new Rule("doesntContain[".$value."]", $prompt);
 	}
 
-	public static function doesntContainExactly($value,$prompt=NULL){
-		return new Rule("doesntContainExactly[".$value."]",$prompt);
+	public static function doesntContainExactly($value, $prompt=NULL) {
+		return new Rule("doesntContainExactly[".$value."]", $prompt);
 	}
 
-	public static function minCount($value,$prompt=NULL){
-		return new Rule("minCount[".$value."]",$prompt);
+	public static function minCount($value, $prompt=NULL) {
+		return new Rule("minCount[".$value."]", $prompt);
 	}
 
-	public static function maxCount($value,$prompt=NULL){
-		return new Rule("maxCount[".$value."]",$prompt);
+	public static function maxCount($value, $prompt=NULL) {
+		return new Rule("maxCount[".$value."]", $prompt);
 	}
 
-	public static function exactCount($value,$prompt=NULL){
-		return new Rule("exactCount[".$value."]",$prompt);
+	public static function exactCount($value, $prompt=NULL) {
+		return new Rule("exactCount[".$value."]", $prompt);
 	}
 
-	public static function email($prompt=NULL){
-		return new Rule("email",$prompt);
+	public static function email($prompt=NULL) {
+		return new Rule("email", $prompt);
 	}
 
-	public static function url($prompt=NULL){
-		return new Rule("url",$prompt);
+	public static function url($prompt=NULL) {
+		return new Rule("url", $prompt);
 	}
 
-	public static function regExp($value,$prompt=NULL){
-		return new Rule("regExp",$prompt,$value);
+	public static function regExp($value, $prompt=NULL) {
+		return new Rule("regExp", $prompt, $value);
 	}
 
-	public static function custom($name,$jsFunction){
-		return "$.fn.form.settings.rules.".$name." =".$jsFunction ;
+	public static function custom($name, $jsFunction) {
+		return "$.fn.form.settings.rules.".$name." =".$jsFunction;
 	}
 
-	public static function ajax(JsUtils $js,$name,$url,$params,$jsCallback,$method="post",$parameters=[]){
-		$parameters=\array_merge(["async"=>false,"url"=>$url,"params"=>$params,"hasLoader"=>false,"jsCallback"=>$jsCallback,"dataType"=>"json","stopPropagation"=>false,"preventDefault"=>false,"responseElement"=>null],$parameters);
+	public static function ajax(JsUtils $js, $name, $url, $params, $jsCallback, $method="post", $parameters=[]) {
+		$parameters=\array_merge(["async"=>false, "url"=>$url, "params"=>$params, "hasLoader"=>false, "jsCallback"=>$jsCallback, "dataType"=>"json", "stopPropagation"=>false, "preventDefault"=>false, "responseElement"=>null], $parameters);
 		$ajax=new AjaxCall($method, $parameters);
 		return self::custom($name, "function(value,ruleValue){var result=true;".$ajax->compile($js)."return result;}");
 	}

Ajax/common/Widget.php

Spacing +75 added lines, -75 removed lines

@@ -20,7 +20,7 @@ 
 use Ajax\common\html\traits\BaseHooksTrait;
 
 abstract class Widget extends HtmlDoubleElement {
-	use FieldAsTrait,FormTrait,BaseHooksTrait;
+	use FieldAsTrait, FormTrait, BaseHooksTrait;
 
 	/**
 	 *
@@ -66,25 +66,25 @@ 
 
 	protected $_hasRules;
 	
-	public function __construct($identifier, $model, $modelInstance = NULL) {
+	public function __construct($identifier, $model, $modelInstance=NULL) {
 		parent::__construct($identifier);
-		$this->_template = "%wrapContentBefore%%content%%wrapContentAfter%";
+		$this->_template="%wrapContentBefore%%content%%wrapContentAfter%";
 		$this->setModel($model);
 		if (isset($modelInstance)) {
 			$this->_model=get_class($modelInstance);
 			$this->show($modelInstance);
 		}
-		$this->_generated = false;
+		$this->_generated=false;
 	}
 
 	protected function _init($instanceViewer, $contentKey, $content, $edition) {
-		$this->_instanceViewer = $instanceViewer;
-		$this->content = [
+		$this->_instanceViewer=$instanceViewer;
+		$this->content=[
 			$contentKey => $content
 		];
-		$this->_self = $content;
-		$this->_toolbarPosition = PositionInTable::BEFORETABLE;
-		$this->_edition = $edition;
+		$this->_self=$content;
+		$this->_toolbarPosition=PositionInTable::BEFORETABLE;
+		$this->_edition=$edition;
 	}
 
 	/**
@@ -93,16 +93,16 @@ 
 	 * @return int|string|boolean
 	 */
 	protected function _getIndex($fieldName) {
-		$index = $fieldName;
+		$index=$fieldName;
 		if (\is_string($fieldName)) {
-			$fields = $this->_instanceViewer->getVisibleProperties();
-			$index = \array_search($fieldName, $fields);
+			$fields=$this->_instanceViewer->getVisibleProperties();
+			$index=\array_search($fieldName, $fields);
 		}
 		return $index;
 	}
 
-	protected function _getFieldIdentifier($prefix, $name = "") {
-		return $this->identifier . "-{$prefix}-" . $this->_instanceViewer->getIdentifier();
+	protected function _getFieldIdentifier($prefix, $name="") {
+		return $this->identifier."-{$prefix}-".$this->_instanceViewer->getIdentifier();
 	}
 
 	protected function _getFieldName($index) {
@@ -113,13 +113,13 @@ 
 		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)) {
-			$modelInstance = \json_decode(\json_encode($modelInstance), FALSE);
+			$modelInstance=\json_decode(\json_encode($modelInstance), FALSE);
 		}
-		$this->_modelInstance = $modelInstance;
+		$this->_modelInstance=$modelInstance;
 	}
 
 	public function getModel() {
@@ -127,7 +127,7 @@ 
 	}
 
 	public function setModel($_model) {
-		$this->_model = $_model;
+		$this->_model=$_model;
 		return $this;
 	}
 
@@ -136,13 +136,13 @@ 
 	}
 
 	public function setInstanceViewer($_instanceViewer) {
-		$this->_instanceViewer = $_instanceViewer;
+		$this->_instanceViewer=$_instanceViewer;
 		return $this;
 	}
 
 	abstract public function getHtmlComponent();
 
-	public function setAttached($value = true) {
+	public function setAttached($value=true) {
 		return $this->getHtmlComponent()->setAttached($value);
 	}
 
@@ -157,8 +157,8 @@ 
 	 * @return Widget
 	 */
 	public function afterCompile($index, $callback) {
-		$index = $this->_getIndex($index);
-		if ($index !== false) {
+		$index=$this->_getIndex($index);
+		if ($index!==false) {
 			$this->_instanceViewer->afterCompile($index, $callback);
 		}
 		return $this;
@@ -183,7 +183,7 @@ 
 		return $this;
 	}
 
-	public function addField($field, $key = null) {
+	public function addField($field, $key=null) {
 		$this->_instanceViewer->addField($field, $key);
 		return $this;
 	}
@@ -197,10 +197,10 @@ 
 		return $this->_instanceViewer->visiblePropertiesCount();
 	}
 
-	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);
+		$count=$this->_instanceViewer->visiblePropertiesCount();
+		return $this->fieldAsMessage($count-1, $attributes);
 	}
 
 	public function addErrorMessage() {
@@ -209,15 +209,15 @@ 
 		], "message");
 	}
 
-	public function insertField($index, $field, $key = null) {
-		$index = $this->_getIndex($index);
+	public function insertField($index, $field, $key=null) {
+		$index=$this->_getIndex($index);
 		$this->_instanceViewer->insertField($index, $field, $key);
 		return $this;
 	}
 
-	public function insertInField($index, $field, $key = null) {
-		$index = $this->_getIndex($index);
-		if ($index !== false) {
+	public function insertInField($index, $field, $key=null) {
+		$index=$this->_getIndex($index);
+		if ($index!==false) {
 			$this->_instanceViewer->insertInField($index, $field, $key);
 		}
 		return $this;
@@ -233,8 +233,8 @@ 
 	 * @return Widget
 	 */
 	public function setValueFunction($index, $callback) {
-		$index = $this->_getIndex($index);
-		if ($index !== false) {
+		$index=$this->_getIndex($index);
+		if ($index!==false) {
 			$this->_instanceViewer->setValueFunction($index, $callback);
 		}
 		return $this;
@@ -250,8 +250,8 @@ 
 	 * @return \Ajax\semantic\html\collections\menus\HtmlMenu
 	 */
 	public function getToolbar() {
-		if (isset($this->_toolbar) === false) {
-			$this->_toolbar = new HtmlMenu("toolbar-" . $this->identifier);
+		if (isset($this->_toolbar)===false) {
+			$this->_toolbar=new HtmlMenu("toolbar-".$this->identifier);
 		}
 		return $this->_toolbar;
 	}
@@ -264,11 +264,11 @@ 
 	 *        	function to call on $element
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
-	public function addInToolbar($element, $callback = NULL) {
-		$tb = $this->getToolbar();
+	public function addInToolbar($element, $callback=NULL) {
+		$tb=$this->getToolbar();
 		if ($element instanceof BaseWidget) {
-			if ($element->getIdentifier() === "") {
-				$element->setIdentifier("tb-item-" . $this->identifier . "-" . $tb->count());
+			if ($element->getIdentifier()==="") {
+				$element->setIdentifier("tb-item-".$this->identifier."-".$tb->count());
 			}
 		}
 		if (isset($callback)) {
@@ -287,8 +287,8 @@ 
 	 *        	function($element)
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
-	public function addItemInToolbar($caption, $icon = NULL, $callback = NULL) {
-		$result = $this->addInToolbar($caption, $callback);
+	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;
@@ -301,7 +301,7 @@ 
 	 *        	function($element)
 	 * @return \Ajax\common\Widget
 	 */
-	public function addItemsInToolbar(array $items, $callback = NULL) {
+	public function addItemsInToolbar(array $items, $callback=NULL) {
 		if (JArray::isAssociative($items)) {
 			foreach ($items as $icon => $item) {
 				$this->addItemInToolbar($item, $icon, $callback);
@@ -322,10 +322,10 @@ 
 	 *        	function($element)
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
-	public function addDropdownInToolbar($value, $items, $callback = NULL) {
-		$dd = $value;
+	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);
 	}
@@ -338,8 +338,8 @@ 
 	 *        	function($element)
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
-	public function addButtonInToolbar($caption, $cssStyle = null, $callback = NULL) {
-		$bt = new HtmlButton("bt-" . $caption, $caption, $cssStyle);
+	public function addButtonInToolbar($caption, $cssStyle=null, $callback=NULL) {
+		$bt=new HtmlButton("bt-".$caption, $caption, $cssStyle);
 		return $this->addInToolbar($bt, $callback);
 	}
 
@@ -351,8 +351,8 @@ 
 	 *        	function($element)
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
-	public function addButtonsInToolbar(array $captions, $asIcon = false, $callback = NULL) {
-		$bts = new HtmlButtonGroups("", $captions, $asIcon);
+	public function addButtonsInToolbar(array $captions, $asIcon=false, $callback=NULL) {
+		$bts=new HtmlButtonGroups("", $captions, $asIcon);
 		return $this->addInToolbar($bts, $callback);
 	}
 
@@ -364,14 +364,14 @@ 
 	 * @param boolean $labeled
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
-	public function addLabelledIconButtonInToolbar($caption, $icon, $before = true, $labeled = false) {
-		$bt = new HtmlButton("", $caption);
+	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);
+	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);
 	}
@@ -394,8 +394,8 @@ 
 	 * @param boolean $_edition
 	 * @return \Ajax\common\Widget
 	 */
-	public function setEdition($_edition = true) {
-		$this->_edition = $_edition;
+	public function setEdition($_edition=true) {
+		$this->_edition=$_edition;
 		return $this;
 	}
 
@@ -424,8 +424,8 @@ 
 	 * @param string|boolean $disable
 	 * @return string
 	 */
-	public function jsDisabled($disable = true) {
-		return "$('#" . $this->identifier . " .ui.input,#" . $this->identifier . " .ui.dropdown,#" . $this->identifier . " .ui.checkbox').toggleClass('disabled'," . $disable . ");";
+	public function jsDisabled($disable=true) {
+		return "$('#".$this->identifier." .ui.input,#".$this->identifier." .ui.dropdown,#".$this->identifier." .ui.checkbox').toggleClass('disabled',".$disable.");";
 	}
 
 	/**
@@ -435,8 +435,8 @@ 
 	 *        	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')")));
@@ -444,18 +444,18 @@ 
 	}
 
 	public function setToolbar(HtmlMenu $_toolbar) {
-		$this->_toolbar = $_toolbar;
+		$this->_toolbar=$_toolbar;
 		return $this;
 	}
 
 	public function setToolbarPosition($_toolbarPosition) {
-		$this->_toolbarPosition = $_toolbarPosition;
+		$this->_toolbarPosition=$_toolbarPosition;
 		return $this;
 	}
 
 	public function getForm() {
-		if (! isset($this->_form)) {
-			$this->_form = new HtmlForm("frm-" . $this->identifier);
+		if (!isset($this->_form)) {
+			$this->_form=new HtmlForm("frm-".$this->identifier);
 			$this->setEdition(true);
 		}
 		return $this->_form;
@@ -469,7 +469,7 @@ 
 	}
 
 	protected function runForm(JsUtils $js) {
-		$fields = $this->getContentInstances(HtmlFormField::class);
+		$fields=$this->getContentInstances(HtmlFormField::class);
 		foreach ($fields as $field) {
 			$this->_form->addField($field);
 		}
@@ -478,10 +478,10 @@ 
 
 	protected function _compileForm() {
 		if (isset($this->_form)) {
-			$noValidate = "";
-			if (\sizeof($this->_form->getValidationParams()) > 0)
-				$noValidate = "novalidate";
-				$this->wrapContent("<form class='".$this->_form->getProperty('class')."' id='frm-" . $this->identifier . "' name='frm-" . $this->identifier . "' " . $noValidate . ">", "</form>");
+			$noValidate="";
+			if (\sizeof($this->_form->getValidationParams())>0)
+				$noValidate="novalidate";
+				$this->wrapContent("<form class='".$this->_form->getProperty('class')."' id='frm-".$this->identifier."' name='frm-".$this->identifier."' ".$noValidate.">", "</form>");
 		}
 	}
 
@@ -503,21 +503,21 @@ 
 	}
 
 	public function swapFields($index1, $index2) {
-		$index1 = $this->_getIndex($index1);
-		$index2 = $this->_getIndex($index2);
+		$index1=$this->_getIndex($index1);
+		$index2=$this->_getIndex($index2);
 		return $this->_instanceViewer->swapFields($index1, $index2);
 	}
 
 	public function removeField($index) {
-		$index = $this->_getIndex($index);
-		if ($index !== false) {
+		$index=$this->_getIndex($index);
+		if ($index!==false) {
 			$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)) {
 			$this->_form->onSuccess($modal->jsHide());
@@ -525,7 +525,7 @@ 
 		return $modal;
 	}
 
-	public function addToProperty($name, $value, $separator = " ") {
+	public function addToProperty($name, $value, $separator=" ") {
 		return $this->getHtmlComponent()->addToProperty($name, $value, $separator);
 	}