phpMv / phpMv-UI

Ajax/semantic/widgets/datatable/JsonDataTable.php

Spacing +32 added lines, -32 removed lines

@@ -22,25 +22,25 @@ 
 		$this->_rowClass="_json _element";
 	}
 
-	protected function _generateContent($table){
+	protected function _generateContent($table) {
 		$this->_addRowModel($table);
 		parent::_generateContent($table);
 	}
 
-	protected function _addRowModel($table){
+	protected function _addRowModel($table) {
 		$fields=$this->_instanceViewer->getSimpleProperties();
-		$row=$this->_createRow($table, $this->_modelClass,$fields);
-		$row->setProperty("style","display:none;");
+		$row=$this->_createRow($table, $this->_modelClass, $fields);
+		$row->setProperty("style", "display:none;");
 		$table->getBody()->_addRow($row);
 	}
 
-	protected function _createRow($table,$rowClass,$fields){
+	protected function _createRow($table, $rowClass, $fields) {
 		$object=JReflection::jsonObject($this->_model);
-		if(isset($this->_rowModelCallback)){
+		if (isset($this->_rowModelCallback)) {
 			$callback=$this->_rowModelCallback;
 			$callback($object);
 		}
-		$row=$this->_generateRow($object, $fields,$table,"_jsonArrayChecked");
+		$row=$this->_generateRow($object, $fields, $table, "_jsonArrayChecked");
 		$row->setClass($rowClass." _element");
 		return $row;
 	}
@@ -49,24 +49,24 @@ 
 	 * {@inheritDoc}
 	 * @see DataTable::_associatePaginationBehavior()
 	 */
-	protected function _associatePaginationBehavior(JsUtils $js=NULL,$offset=null){
+	protected function _associatePaginationBehavior(JsUtils $js=NULL, $offset=null) {
 		$callback=null;
 		$menu=$this->_pagination->getMenu();
 		
-		if(isset($js)){
+		if (isset($js)) {
 			$id=$this->identifier;
 			$callback=$js->getScript($offset).$this->getHtmlComponent()->getInnerScript();
-			$callback.=$js->trigger("#".$id." [name='selection[]']","change",false)."$('#".$id." tbody .ui.checkbox').checkbox();".$js->execOn("change", "#".$id." [name='selection[]']", $this->_getCheckedChange($js));
+			$callback.=$js->trigger("#".$id." [name='selection[]']", "change", false)."$('#".$id." tbody .ui.checkbox').checkbox();".$js->execOn("change", "#".$id." [name='selection[]']", $this->_getCheckedChange($js));
 			$callback.=$this->_generatePaginationScript($id);
-			if(isset($this->_urls["refresh"])){
-				if(isset($menu))
-				$js->jsonArrayOn("click", "#".$menu->getIdentifier()." a","#".$this->_identifier." tr.".$this->_modelClass, $this->_urls["refresh"],"post",["params"=>"{'p':$(this).attr('data-page'),'_model':'".JString::doubleBackSlashes($this->_model)."'}","jsCallback"=>$callback]);
+			if (isset($this->_urls["refresh"])) {
+				if (isset($menu))
+				$js->jsonArrayOn("click", "#".$menu->getIdentifier()." a", "#".$this->_identifier." tr.".$this->_modelClass, $this->_urls["refresh"], "post", ["params"=>"{'p':$(this).attr('data-page'),'_model':'".JString::doubleBackSlashes($this->_model)."'}", "jsCallback"=>$callback]);
 			}
 		}
 
 	}
 	
-	protected function _generatePaginationScript($id){
+	protected function _generatePaginationScript($id) {
 		return ";var page=parseInt($(self).attr('data-page')) || 1;var pages_visibles=$('#pagination-{$id} .item').length-2;
 			var lastPage=$('#pagination-{$id} ._lastPage');
 			var middle= Math.ceil((pages_visibles-1)/ 2);
@@ -86,16 +86,16 @@ 
 			lastPage.attr('data-page',Math.min(lastPage.attr('data-max'),page+1));
 			$('#{$id}').trigger('pageChange');$('#{$id}').trigger('activeRowChange');$('#pagination-{$id}').show();";
 	}
-	protected function _compileSearchFieldBehavior(JsUtils $js=NULL){
+	protected function _compileSearchFieldBehavior(JsUtils $js=NULL) {
 		
 	}
-	protected function _associateSearchFieldBehavior(JsUtils $js=NULL,$offset=null){
-		if(isset($this->_searchField) && isset($js) && isset($this->_urls["refresh"])){
+	protected function _associateSearchFieldBehavior(JsUtils $js=NULL, $offset=null) {
+		if (isset($this->_searchField) && isset($js) && isset($this->_urls["refresh"])) {
 			$id=$this->identifier;
 			$callback=$js->getScript($offset).$this->getHtmlComponent()->getInnerScript();
-			$callback.=$js->trigger("#".$id." [name='selection[]']","change",false)."$('#".$id." tbody .ui.checkbox').checkbox();".$js->execOn("change", "#".$id." [name='selection[]']", $this->_getCheckedChange($js));
+			$callback.=$js->trigger("#".$id." [name='selection[]']", "change", false)."$('#".$id." tbody .ui.checkbox').checkbox();".$js->execOn("change", "#".$id." [name='selection[]']", $this->_getCheckedChange($js));
 			$callback.="$('#pagination-{$id}').hide();$('#".$this->identifier."').trigger('searchTerminate',[$(self).val()]);";
-			$js->jsonArrayOn("change", "#".$this->_searchField->getDataField()->getIdentifier(),"#".$this->_identifier." tr.".$this->_modelClass, $this->_urls["refresh"],"post",["params"=>"{'s':$(self).val(),'_model':'".JString::doubleBackSlashes($this->_model)."'}","jsCallback"=>$callback]);
+			$js->jsonArrayOn("change", "#".$this->_searchField->getDataField()->getIdentifier(), "#".$this->_identifier." tr.".$this->_modelClass, $this->_urls["refresh"], "post", ["params"=>"{'s':$(self).val(),'_model':'".JString::doubleBackSlashes($this->_model)."'}", "jsCallback"=>$callback]);
 		}
 	}
 	
@@ -109,29 +109,29 @@ 
 	 * @param string $jsCallback
 	 * @return AjaxCall
 	 */
-	public function jsJsonArray($url, $method="get", $params="{}", $jsCallback=NULL,$parameters=[]){
-		$parameters=\array_merge($parameters,["modelSelector"=>"#".$this->_identifier." tr.".$this->_modelClass,"url"=>$url,"method"=>$method,"params"=>$params,"jsCallback"=>$jsCallback]);
+	public function jsJsonArray($url, $method="get", $params="{}", $jsCallback=NULL, $parameters=[]) {
+		$parameters=\array_merge($parameters, ["modelSelector"=>"#".$this->_identifier." tr.".$this->_modelClass, "url"=>$url, "method"=>$method, "params"=>$params, "jsCallback"=>$jsCallback]);
 		return new AjaxCall("jsonArray", $parameters);
 	}
 
-	public function jsClear(){
+	public function jsClear() {
 		return "$('#{$this->identifier} tbody').find('._json').remove();";
 	}
 
-	public function clearOn(BaseHtml $element,$event, $stopPropagation=false, $preventDefault=false){
-		return $element->addEvent($event, $this->jsClear(),$stopPropagation,$preventDefault);
+	public function clearOn(BaseHtml $element, $event, $stopPropagation=false, $preventDefault=false) {
+		return $element->addEvent($event, $this->jsClear(), $stopPropagation, $preventDefault);
 	}
 
-	public function clearOnClick(BaseHtml $element,$stopPropagation=false, $preventDefault=false){
-		return $this->clearOn($element, "click",$stopPropagation,$preventDefault);
+	public function clearOnClick(BaseHtml $element, $stopPropagation=false, $preventDefault=false) {
+		return $this->clearOn($element, "click", $stopPropagation, $preventDefault);
 	}
 
-	public function jsonArrayOn(BaseHtml $element,$event,$url, $method="get", $params="{}", $jsCallback=NULL,$parameters=[]){
-		return $element->_addEvent($event, $this->jsJsonArray($url,$method,$params,$jsCallback,$parameters));
+	public function jsonArrayOn(BaseHtml $element, $event, $url, $method="get", $params="{}", $jsCallback=NULL, $parameters=[]) {
+		return $element->_addEvent($event, $this->jsJsonArray($url, $method, $params, $jsCallback, $parameters));
 	}
 
-	public function jsonArrayOnClick(BaseHtml $element,$url, $method="get", $params="{}", $jsCallback=NULL,$parameters=[]){
-		return $this->jsonArrayOn($element, "click", $url,$method,$params,$jsCallback,$parameters);
+	public function jsonArrayOnClick(BaseHtml $element, $url, $method="get", $params="{}", $jsCallback=NULL, $parameters=[]) {
+		return $this->jsonArrayOn($element, "click", $url, $method, $params, $jsCallback, $parameters);
 	}
 
 	/**
@@ -142,8 +142,8 @@ 
 	 * @param number $pages_visibles The number of visible pages in the Pagination component
 	 * @return DataTable
 	 */
-	public function paginate($page,$total_rowcount,$items_per_page=10,$pages_visibles=null){
-		return parent::paginate($page, $total_rowcount,$items_per_page,$pages_visibles);
+	public function paginate($page, $total_rowcount, $items_per_page=10, $pages_visibles=null) {
+		return parent::paginate($page, $total_rowcount, $items_per_page, $pages_visibles);
 	}
 
 	public function setRowModelCallback($_rowModelCallback) {

Ajax/semantic/traits/SemanticHtmlModulesTrait.php

Spacing +5 added lines, -5 removed lines

@@ -43,8 +43,8 @@ 
 	 * @param string $type
 	 * @return HtmlFormFields
 	 */
-	public function htmlRadios($identifier, $items=[], $label=NULL,$value=NULL, $type=NULL) {
-		return $this->addHtmlComponent(HtmlFormFields::radios($identifier,$items,$label,$value,$type));
+	public function htmlRadios($identifier, $items=[], $label=NULL, $value=NULL, $type=NULL) {
+		return $this->addHtmlComponent(HtmlFormFields::radios($identifier, $items, $label, $value, $type));
 	}
 
 	/**
@@ -100,7 +100,7 @@ 
 	 * @return HtmlModal
 	 */
 	public function htmlModal($identifier, $header="", $content="", $actions=array()) {
-		return $this->addHtmlComponent(new HtmlModal($identifier, $header,$content,$actions));
+		return $this->addHtmlComponent(new HtmlModal($identifier, $header, $content, $actions));
 	}
 
 	/**
@@ -131,8 +131,8 @@ 
 	 * @param boolean $associative
 	 * @return HtmlDropdown
 	 */
-	public function htmlDropdown($identifier, $value="", $items=array(),$associative=true) {
-		return $this->addHtmlComponent(new HtmlDropdown($identifier, $value, $items,$associative));
+	public function htmlDropdown($identifier, $value="", $items=array(), $associative=true) {
+		return $this->addHtmlComponent(new HtmlDropdown($identifier, $value, $items, $associative));
 	}
 
 	/**

Ajax/common/html/BaseWidget.php

Spacing +2 added lines, -2 removed lines

@@ -37,7 +37,7 @@ 
 	 * @return mixed
 	 */
 	public function getLibraryId() {
-		if( isset($this->_libraryId)){
+		if (isset($this->_libraryId)) {
 			return $this->_libraryId;
 		}
 		return $this->identifier;
@@ -47,7 +47,7 @@ 
 	 * @param mixed $_libraryId
 	 */
 	public function setLibraryId($_libraryId) {
-		$this->_libraryId = $_libraryId;
+		$this->_libraryId=$_libraryId;
 	}
 
 }

Ajax/common/html/BaseHtml.php

Spacing +59 added lines, -59 removed lines

@@ -15,11 +15,11 @@ 
  * @version 1.3
  */
 abstract class BaseHtml extends BaseWidget {
-	use BaseHtmlEventsTrait,BaseHtmlPropertiesTrait;
+	use BaseHtmlEventsTrait, BaseHtmlPropertiesTrait;
 	protected $_template;
 	protected $tagName;
-	protected $_wrapBefore=array ();
-	protected $_wrapAfter=array ();
+	protected $_wrapBefore=array();
+	protected $_wrapAfter=array();
 	protected $_bsComponent;
 	protected $_compiled=false;
 	protected $_runned=false;
@@ -33,32 +33,32 @@ 
 	 */
 	abstract public function run(JsUtils $js);
 
-	private function _callSetter($setter,$key,$value,&$array){
+	private function _callSetter($setter, $key, $value, &$array) {
 		$result=false;
-		if (method_exists($this, $setter) && substr($setter, 0, 1) !== "_") {
+		if (method_exists($this, $setter) && substr($setter, 0, 1)!=="_") {
 			try {
 				$this->$setter($value);
 				unset($array[$key]);
 				$result=true;
-			} catch ( \Exception $e ) {
+			}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);
+				throw new \Exception("La fonction ".$typeCtrl." a retourné faux pour l'affectation de la propriété ".$name);
 			}
 		}
 		return true;
@@ -75,7 +75,7 @@ 
 	protected function addToMemberUnique(&$name, $value, $typeCtrl, $separator=" ") {
 		if (\is_array($typeCtrl)) {
 			$this->removeOldValues($name, $typeCtrl);
-			$name.=$separator . $value;
+			$name.=$separator.$value;
 		}
 		return $this;
 	}
@@ -87,12 +87,12 @@ 
 		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;
+		$name=str_ireplace($value, "", $name).$separator.$value;
 		return $this;
 	}
 
@@ -103,18 +103,18 @@ 
 		$oldValue=trim($oldValue);
 	}
 
-	protected function _getElementBy($callback,$elements){
+	protected function _getElementBy($callback, $elements) {
 		if (\is_array($elements)) {
 			$elements=\array_values($elements);
 			$flag=false;
 			$index=0;
-			while ( !$flag && $index < sizeof($elements) ) {
+			while (!$flag && $index<sizeof($elements)) {
 				if ($elements[$index] instanceof BaseHtml)
 					$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;
@@ -142,13 +142,13 @@ 
 	}
 
 	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);
+		foreach ($this as $key => $value) {
+			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);
+		foreach ($array as $key => $value) {
+			if ($this->_callSetter($key, $key, $value, $array)===false) {
+				$this->_callSetter("set".ucfirst($key), $key, $value, $array);
 			}
 		}
 		return $array;
@@ -156,7 +156,7 @@ 
 
 	public function fromDatabaseObjects($objects, $function) {
 		if (isset($objects)) {
-			foreach ( $objects as $object ) {
+			foreach ($objects as $object) {
 				$this->fromDatabaseObject($object, $function);
 			}
 		}
@@ -177,7 +177,7 @@ 
 
 
 	public function getElementById($identifier, $elements) {
-		return $this->_getElementBy(function(BaseWidget $element) use ($identifier){return $element->getIdentifier()===$identifier;}, $elements);
+		return $this->_getElementBy(function(BaseWidget $element) use ($identifier){return $element->getIdentifier()===$identifier; }, $elements);
 	}
 
 	public function getBsComponent() {
@@ -190,11 +190,11 @@ 
 	}
 
 	protected function compile_once(JsUtils $js=NULL, &$view=NULL) {
-		if(!$this->_compiled){
-			if(isset($js)){
+		if (!$this->_compiled) {
+			if (isset($js)) {
 				$beforeCompile=$js->getParam("beforeCompileHtml");
-				if(\is_callable($beforeCompile)){
-					$beforeCompile($this,$js,$view);
+				if (\is_callable($beforeCompile)) {
+					$beforeCompile($this, $js, $view);
 				}
 			}
 			$this->callCallback($this->_preCompile);
@@ -204,17 +204,17 @@ 
 	}
 
 	public function compile(JsUtils $js=NULL, &$view=NULL) {
-		$this->compile_once($js,$view);
-		$result=$this->getTemplate($js,$view);
-		foreach ( $this as $key => $value ) {
-				if(\strstr($result, "%{$key}%")!==false){
+		$this->compile_once($js, $view);
+		$result=$this->getTemplate($js, $view);
+		foreach ($this as $key => $value) {
+				if (\strstr($result, "%{$key}%")!==false) {
 					if (\is_array($value)) {
-						$v=PropertyWrapper::wrap($value, $js,$view);
-					}elseif($value instanceof \stdClass){
-							$v=\print_r($value,true);
-					}elseif ($value instanceof BaseHtml){
-						$v=$value->compile($js,$view);
-					}else{
+						$v=PropertyWrapper::wrap($value, $js, $view);
+					}elseif ($value instanceof \stdClass) {
+							$v=\print_r($value, true);
+					}elseif ($value instanceof BaseHtml) {
+						$v=$value->compile($js, $view);
+					} else {
 						$v=$value;
 					}
 					$result=str_replace("%{$key}%", $v, $result);
@@ -222,12 +222,12 @@ 
 		}
 		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)){
+		if (\is_callable($this->_postCompile)) {
 			$pc=$this->_postCompile;
 			$pc($this);
 		}
@@ -241,13 +241,13 @@ 
 	 * @param array $parameters 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="";
+		$this->addEvent("dragstart", Javascript::draggable($attr));
+		if (isset($dropZone) && $dropZone instanceof BaseHtml) {
+			$jqueryDone="append"; $jsCallback="";
 			extract($parameters);
-			$dropZone->asDropZone($jsCallback,$jqueryDone,$parameters);
+			$dropZone->asDropZone($jsCallback, $jqueryDone, $parameters);
 		}
 		return $this;
 	}
@@ -259,11 +259,11 @@ 
 	 * @param array $parameters
 	 * @return \Ajax\common\html\BaseHtml
 	 */
-	public function asDropZone($jsCallback="",$jqueryDone="append",$parameters=[]){
+	public function asDropZone($jsCallback="", $jqueryDone="append", $parameters=[]) {
 		$stopPropagation=false;
-		$this->addEvent("dragover", '', $stopPropagation,true);
+		$this->addEvent("dragover", '', $stopPropagation, true);
 		extract($parameters);
-		$this->addEvent("drop",Javascript::dropZone($jqueryDone,$jsCallback),$stopPropagation,true);
+		$this->addEvent("drop", Javascript::dropZone($jqueryDone, $jsCallback), $stopPropagation, true);
 		return $this;
 	}
 
@@ -271,17 +271,17 @@ 
 		return $this->compile();
 	}
 
-	public function onPostCompile($callback){
+	public function onPostCompile($callback) {
 		$this->_postCompile=$callback;
 	}
 
-	public function onPreCompile($callback){
+	public function onPreCompile($callback) {
 		$this->_preCompile=$this->addCallback($this->_preCompile, $callback);
 	}
 	
-	private function addCallback($originalValue,$callback){
-		if(isset($originalValue)){
-			if(!is_array($originalValue)){
+	private function addCallback($originalValue, $callback) {
+		if (isset($originalValue)) {
+			if (!is_array($originalValue)) {
 				$result=[$originalValue];
 			}
 			$result[]=$callback;
@@ -290,12 +290,12 @@ 
 		return $callback;
 	}
 	
-	private function callCallback($callable){
-		if(\is_callable($callable)){
+	private function callCallback($callable) {
+		if (\is_callable($callable)) {
 			return $callable($this);
 		}
-		if(is_array($callable)){
-			foreach ($callable as $call){
+		if (is_array($callable)) {
+			foreach ($callable as $call) {
 				$this->callCallback($call);
 			}
 		}

Ajax/common/html/traits/BaseHooksTrait.php

Spacing +7 added lines, -7 removed lines

@@ -9,7 +9,7 @@ 
 	 * @param string $hookKey
 	 * @return boolean
 	 */
-	public function hookExists($hookKey){
+	public function hookExists($hookKey) {
 		return isset($this->_hooks[$hookKey]);
 	}
 	
@@ -17,8 +17,8 @@ 
 	 * @param string $hookKey
 	 * @return callable|NULL
 	 */
-	public function getHook($hookKey){
-		if(isset($this->_hooks[$hookKey])){
+	public function getHook($hookKey) {
+		if (isset($this->_hooks[$hookKey])) {
 			return $this->_hooks[$hookKey];
 		}
 		return null;
@@ -29,7 +29,7 @@ 
 	 * @param String $hookKey
 	 * @param callable $callable
 	 */
-	public function addHook($hookKey,$callable){
+	public function addHook($hookKey, $callable) {
 		$this->_hooks[$hookKey]=$callable;
 	}
 	
@@ -39,9 +39,9 @@ 
 	 * @param mixed|null $variable
 	 * @return void|mixed
 	 */
-	public function execHook($hookKey,...$variables){
-		if(($hook=$this->getHook($hookKey))!=null){
-			return call_user_func_array($hook,$variables);
+	public function execHook($hookKey, ...$variables) {
+		if (($hook=$this->getHook($hookKey))!=null) {
+			return call_user_func_array($hook, $variables);
 		}
 		return;
 	}

Ajax/common/html/HtmlContentOnly.php

Spacing +2 added lines, -2 removed lines

@@ -2,8 +2,8 @@
 
 namespace Ajax\common\html;
 
-class HtmlContentOnly extends HtmlDoubleElement{
-	public function __construct($content,$identifier=""){
+class HtmlContentOnly extends HtmlDoubleElement {
+	public function __construct($content, $identifier="") {
 		parent::__construct($identifier);
 		$this->_template='%wrapContentBefore%%content%%wrapContentAfter%';
 		$this->setContent($content);

Ajax/semantic/widgets/dataelement/DataElement.php

Spacing +26 added lines, -26 removed lines

@@ -22,72 +22,72 @@ 
 	protected $_colWidths;
 
 	public function __construct($identifier, $modelInstance=NULL) {
-		parent::__construct($identifier, null,$modelInstance);
-		$this->_init(new DeInstanceViewer($identifier), "table", new HtmlTable($identifier, 0,2), false);
+		parent::__construct($identifier, null, $modelInstance);
+		$this->_init(new DeInstanceViewer($identifier), "table", new HtmlTable($identifier, 0, 2), false);
 		$this->content["table"]->setDefinition()->addClass("_element");
 	}
 
-	public function compile(JsUtils $js=NULL,&$view=NULL){
-		if(!$this->_generated){
+	public function compile(JsUtils $js=NULL, &$view=NULL) {
+		if (!$this->_generated) {
 			$this->_instanceViewer->setInstance($this->_modelInstance);
 
 			$table=$this->content["table"];
 			$this->_generateContent($table);
 
-			if(isset($this->_toolbar)){
+			if (isset($this->_toolbar)) {
 				$this->_setToolbarPosition($table);
 			}
-			if(isset($this->_colWidths)){
+			if (isset($this->_colWidths)) {
 				$this->_applyStyleAttributes($table);
 			}
-			$this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE,"table",PositionInTable::AFTERTABLE]);
+			$this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE, "table", PositionInTable::AFTERTABLE]);
 			$this->_compileForm();
 			$this->_generated=true;
 		}
-		return parent::compile($js,$view);
+		return parent::compile($js, $view);
 	}
 
 	/**
 	 * @param HtmlTable $table
 	 */
-	protected function _generateContent($table){
-		$values= $this->_instanceViewer->getValues();
+	protected function _generateContent($table) {
+		$values=$this->_instanceViewer->getValues();
 		$captions=$this->_instanceViewer->getCaptions();
 		$fields=$this->_instanceViewer->getVisibleProperties();
 		$count=$this->_instanceViewer->count();
 		$this->setProperty("data-ajax", $this->_instanceViewer->getIdentifier());
-		for($i=0;$i<$count;$i++){
-			$row=$table->addRow([$captions[$i],$values[$i]]);
+		for ($i=0; $i<$count; $i++) {
+			$row=$table->addRow([$captions[$i], $values[$i]]);
 			$row->getItem(1)->setProperty("data-field", $fields[$i]);
 		}
 	}
 	
-	public function getFieldValue($index){
-		if(is_string($index)){
+	public function getFieldValue($index) {
+		if (is_string($index)) {
 			$fields=$this->_instanceViewer->getVisibleProperties();
 			$index=array_search($index, $fields);
 		}
-		if(is_numeric($index)){
-			$values= $this->_instanceViewer->getValues();
-			if(isset($values[$index])){
+		if (is_numeric($index)) {
+			$values=$this->_instanceViewer->getValues();
+			if (isset($values[$index])) {
 				return $values[$index];
 			}
 		}
 		return null;
 	}
 
-	protected function _applyStyleAttributes(HtmlTable $table){
+	protected function _applyStyleAttributes(HtmlTable $table) {
 		$table->setColWidths($this->_colWidths);
 	}
-	protected function _getFieldName($index){
+	protected function _getFieldName($index) {
 		return $this->_instanceViewer->getFieldName($index);
 	}
 
-	protected function _getFieldCaption($index){
+	protected function _getFieldCaption($index) {
 		return null;
 	}
 
-	protected function _getFieldIdentifier($prefix,$name=""){
+	protected function _getFieldIdentifier($prefix, $name="") {
 		return $this->identifier."-{$prefix}-".$name;
 	}
 
@@ -119,11 +119,11 @@ 
 		return $this;
 	}
 
-	public function asForm(){
+	public function asForm() {
 		return $this->getForm();
 	}
 
-	public function setColCaptionWidth($width){
+	public function setColCaptionWidth($width) {
 		$this->_colWidths[0]=$width;
 		return $this;
 	}
@@ -133,13 +133,13 @@ 
 		return $this;
 	}
 
-	public function setColWidths($widths){
+	public function setColWidths($widths) {
 		$this->_colWidths=$widths;
 		return $this;
 	}
 	
-	public function run(JsUtils $js){
-		if(JString::isNotNull($this->_identifier))
+	public function run(JsUtils $js) {
+		if (JString::isNotNull($this->_identifier))
 			$js->execOn("click", "#".$this->_identifier." .ui.toggle", 'var active=$(this).hasClass("active");$(this).children("i").toggleClass("up",active).toggleClass("down",!active);var nextTd=$(this).closest("td").next("td");nextTd.children(":not(.toggle-caption)").toggle(active);nextTd.children(".toggle-caption").toggle(!active);$(this).trigger({type:"toggled",active: active,caption: nextTd.children(".toggle-caption")});');
 		parent::run($js);
 	}

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

Spacing +46 added lines, -46 removed lines

@@ -20,35 +20,35 @@ 
  * @property string $identifier
  */
 trait FieldsTrait {
-	abstract public function addFields($fields=NULL,$label=NULL);
+	abstract public function addFields($fields=NULL, $label=NULL);
 	abstract public function addItem($item);
 	abstract public function getItem($index);
 	abstract public function count();
 
-	protected function createItem($value){
-		if(\is_array($value)){
-			$itemO=new HtmlFormInput(JArray::getDefaultValue($value, "id",""),JArray::getDefaultValue($value, "label",null),JArray::getDefaultValue($value, "type", "text"),JArray::getDefaultValue($value, "value",""),JArray::getDefaultValue($value, "placeholder",JArray::getDefaultValue($value, "label",null)));
+	protected function createItem($value) {
+		if (\is_array($value)) {
+			$itemO=new HtmlFormInput(JArray::getDefaultValue($value, "id", ""), JArray::getDefaultValue($value, "label", null), JArray::getDefaultValue($value, "type", "text"), JArray::getDefaultValue($value, "value", ""), JArray::getDefaultValue($value, "placeholder", JArray::getDefaultValue($value, "label", null)));
 			return $itemO;
-		}elseif(\is_object($value)){
+		}elseif (\is_object($value)) {
 			$itemO=new HtmlFormField("field-".$this->identifier, $value);
 			return $itemO;
-		}else
+		} else
 			return new HtmlFormInput($value);
 	}
 
-	protected function createCondition($value){
+	protected function createCondition($value) {
 		return \is_object($value)===false || $value instanceof \Ajax\semantic\html\elements\HtmlInput;
 	}
 
-	public function addInputs($inputs,$fieldslabel=null){
+	public function addInputs($inputs, $fieldslabel=null) {
 		$fields=array();
-		foreach ($inputs as $input){
+		foreach ($inputs as $input) {
 			\extract($input);
-			$f=new HtmlFormInput("","");
+			$f=new HtmlFormInput("", "");
 			$f->fromArray($input);
 			$fields[]=$f;
 		}
-		return $this->addFields($fields,$fieldslabel);
+		return $this->addFields($fields, $fieldslabel);
 	}
 
 	/**
@@ -57,35 +57,35 @@ 
 	 * @param array|mixed $values
 	 * @return HtmlFormFields
 	 */
-	public function setFieldsPropertyValues($property,$values){
+	public function setFieldsPropertyValues($property, $values) {
 		$i=0;
-		if(\is_array($values)===false){
-			$values=\array_fill(0, $this->count(),$values);
+		if (\is_array($values)===false) {
+			$values=\array_fill(0, $this->count(), $values);
 		}
-		foreach ($values as $value){
+		foreach ($values as $value) {
 			$c=$this->content[$i++];
-			if(isset($c)){
+			if (isset($c)) {
 				$df=$c->getDataField();
-				$df->setProperty($property,$value);
+				$df->setProperty($property, $value);
 			}
-			else{
+			else {
 				return $this;
 			}
 		}
 		return $this;
 	}
 
-	public function addFieldRule($index,$type,$prompt=NULL,$value=NULL){
+	public function addFieldRule($index, $type, $prompt=NULL, $value=NULL) {
 		$field=$this->getItem($index);
-		if(isset($field)){
-			$field->addRule($type,$prompt,$value);
+		if (isset($field)) {
+			$field->addRule($type, $prompt, $value);
 		}
 		return $this;
 	}
 
-	public function addFieldRules($index,$rules){
+	public function addFieldRules($index, $rules) {
 		$field=$this->getItem($index);
-		if(isset($field)){
+		if (isset($field)) {
 			$field->addRules($rules);
 		}
 		return $this;
@@ -100,8 +100,8 @@ 
 	 * @param boolean $multiple
 	 * @return HtmlFormDropdown
 	 */
-	public function addDropdown($identifier,$items=array(), $label=NULL,$value=NULL,$multiple=false){
-		return $this->addItem(new HtmlFormDropdown($identifier,$items,$label,$value,$multiple));
+	public function addDropdown($identifier, $items=array(), $label=NULL, $value=NULL, $multiple=false) {
+		return $this->addItem(new HtmlFormDropdown($identifier, $items, $label, $value, $multiple));
 	}
 
 	/**
@@ -111,8 +111,8 @@ 
 	 * @param boolean $asIcons
 	 * @return HtmlButtonGroups
 	 */
-	public function addButtonGroups($identifier,$elements=[],$asIcons=false){
-		return $this->addItem(new HtmlButtonGroups($identifier,$elements,$asIcons));
+	public function addButtonGroups($identifier, $elements=[], $asIcons=false) {
+		return $this->addItem(new HtmlButtonGroups($identifier, $elements, $asIcons));
 	}
 
 	/**
@@ -124,8 +124,8 @@ 
 	 * @param string $icon
 	 * @return HtmlButtonGroups
 	 */
-	public function addDropdownButton($identifier,$value,$items=[],$asCombo=false,$icon=null){
-		return $this->addItem(HtmlButton::dropdown($identifier, $value,$items,$asCombo,$icon));
+	public function addDropdownButton($identifier, $value, $items=[], $asCombo=false, $icon=null) {
+		return $this->addItem(HtmlButton::dropdown($identifier, $value, $items, $asCombo, $icon));
 	}
 
 	/**
@@ -136,8 +136,8 @@ 
 	 * @param string $placeholder
 	 * @return HtmlFormInput
 	 */
-	public function addInput($identifier, $label=NULL,$type="text",$value=NULL,$placeholder=NULL){
-		return $this->addItem(new HtmlFormInput($identifier,$label,$type,$value,$placeholder));
+	public function addInput($identifier, $label=NULL, $type="text", $value=NULL, $placeholder=NULL) {
+		return $this->addItem(new HtmlFormInput($identifier, $label, $type, $value, $placeholder));
 	}
 
 	/**
@@ -148,22 +148,22 @@ 
 	 * @param int $rows
 	 * @return HtmlTextarea
 	 */
-	public function addTextarea($identifier, $label,$value=NULL,$placeholder=NULL,$rows=5){
-		return $this->addItem(new HtmlFormTextarea($identifier,$label,$value,$placeholder,$rows));
+	public function addTextarea($identifier, $label, $value=NULL, $placeholder=NULL, $rows=5) {
+		return $this->addItem(new HtmlFormTextarea($identifier, $label, $value, $placeholder, $rows));
 	}
 
-	public function addPassword($identifier, $label=NULL){
-		return $this->addItem(new HtmlFormInput($identifier,$label,"password","",""));
+	public function addPassword($identifier, $label=NULL) {
+		return $this->addItem(new HtmlFormInput($identifier, $label, "password", "", ""));
 	}
 
-	public function addButton($identifier,$value,$cssStyle=NULL,$onClick=NULL){
-		return $this->addItem(new HtmlButton($identifier,$value,$cssStyle,$onClick));
+	public function addButton($identifier, $value, $cssStyle=NULL, $onClick=NULL) {
+		return $this->addItem(new HtmlButton($identifier, $value, $cssStyle, $onClick));
 	}
 	
-	public function addButtonIcon($identifier,$icon,$cssStyle=NULL,$onClick=NULL){
+	public function addButtonIcon($identifier, $icon, $cssStyle=NULL, $onClick=NULL) {
 		$bt=new HtmlButton($identifier);
 		$bt->asIcon($icon);
-		if(isset($onClick))
+		if (isset($onClick))
 			$bt->onClick($onClick);
 		if (isset($cssStyle))
 			$bt->addClass($cssStyle);
@@ -177,16 +177,16 @@ 
 	 * @param string $type
 	 * @return HtmlFormCheckbox
 	 */
-	public function addCheckbox($identifier, $label=NULL,$value=NULL,$type=NULL){
-		return $this->addItem(new HtmlFormCheckbox($identifier,$label,$value,$type));
+	public function addCheckbox($identifier, $label=NULL, $value=NULL, $type=NULL) {
+		return $this->addItem(new HtmlFormCheckbox($identifier, $label, $value, $type));
 	}
 
-	public function addRadio($identifier, $name,$label=NULL,$value=NULL){
-		return $this->addItem(new HtmlFormRadio($identifier,$name,$label,$value));
+	public function addRadio($identifier, $name, $label=NULL, $value=NULL) {
+		return $this->addItem(new HtmlFormRadio($identifier, $name, $label, $value));
 	}
 
-	public function addElement($identifier,$content,$label,$tagName="div",$baseClass=""){
-		$div=new HtmlSemDoubleElement($identifier,$tagName,$baseClass,$content);
-		return $this->addItem(new HtmlFormField("field-".$identifier, $div,$label));
+	public function addElement($identifier, $content, $label, $tagName="div", $baseClass="") {
+		$div=new HtmlSemDoubleElement($identifier, $tagName, $baseClass, $content);
+		return $this->addItem(new HtmlFormField("field-".$identifier, $div, $label));
 	}
 }

Ajax/semantic/traits/SemanticHtmlCollectionsTrait.php

Spacing +4 added lines, -4 removed lines

@@ -22,7 +22,7 @@ 
 	 * @param int $colCount
 	 * @return HtmlTable
 	 */
-	public function htmlTable($identifier, $rowCount, $colCount){
+	public function htmlTable($identifier, $rowCount, $colCount) {
 		return $this->addHtmlComponent(new HtmlTable($identifier, $rowCount, $colCount));
 	}
 
@@ -33,9 +33,9 @@ 
 	 * @param $styles string|array|NULL
 	 * @return HtmlMessage
 	 */
-	public function htmlMessage($identifier, $content="",$styles=NULL) {
-		$msg= $this->addHtmlComponent(new HtmlMessage($identifier, $content));
-		if(isset($msg) && $styles!==null)
+	public function htmlMessage($identifier, $content="", $styles=NULL) {
+		$msg=$this->addHtmlComponent(new HtmlMessage($identifier, $content));
+		if (isset($msg) && $styles!==null)
 			$msg->setStyle($styles);
 		return $msg;
 	}