phpMv / phpMv-UI

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/datatable/DataTable.php

Spacing +145 added lines, -145 removed lines

@@ -25,7 +25,7 @@ 
  *
  */
 class DataTable extends Widget {
-	use TableTrait,DataTableFieldAsTrait,HasCheckboxesTrait,BaseTrait;
+	use TableTrait, DataTableFieldAsTrait, HasCheckboxesTrait, BaseTrait;
 	protected $_searchField;
 	protected $_urls;
 	protected $_pagination;
@@ -44,41 +44,41 @@ 
 	protected $_colWidths;
 
 
-	public function __construct($identifier,$model,$modelInstance=NULL) {
-		parent::__construct($identifier, $model,$modelInstance);
-		$this->_init(new InstanceViewer($identifier), "table", new HtmlTable($identifier, 0,0), false);
+	public function __construct($identifier, $model, $modelInstance=NULL) {
+		parent::__construct($identifier, $model, $modelInstance);
+		$this->_init(new InstanceViewer($identifier), "table", new HtmlTable($identifier, 0, 0), false);
 		$this->_urls=[];
-		$this->_emptyMessage=new HtmlMessage("","nothing to display");
+		$this->_emptyMessage=new HtmlMessage("", "nothing to display");
 		$this->_emptyMessage->setIcon("info circle");
 	}
 
-	public function run(JsUtils $js){
+	public function run(JsUtils $js) {
 		$offset=$js->scriptCount();
-		if($this->_hasCheckboxes && isset($js)){
+		if ($this->_hasCheckboxes && isset($js)) {
 			$this->_runCheckboxes($js);
 		}
-		if($this->_visibleHover){
-			$js->execOn("mouseover", "#".$this->identifier." tr", "$(event.target).closest('tr').find('.visibleover').css('visibility', 'visible');",["preventDefault"=>false,"stopPropagation"=>true]);
-			$js->execOn("mouseout", "#".$this->identifier." tr", "$(event.target).closest('tr').find('.visibleover').css('visibility', 'hidden');",["preventDefault"=>false,"stopPropagation"=>true]);
+		if ($this->_visibleHover) {
+			$js->execOn("mouseover", "#".$this->identifier." tr", "$(event.target).closest('tr').find('.visibleover').css('visibility', 'visible');", ["preventDefault"=>false, "stopPropagation"=>true]);
+			$js->execOn("mouseout", "#".$this->identifier." tr", "$(event.target).closest('tr').find('.visibleover').css('visibility', 'hidden');", ["preventDefault"=>false, "stopPropagation"=>true]);
 		}
-		if(\is_array($this->_deleteBehavior))
-			$this->_generateBehavior("delete",$this->_deleteBehavior, $js);
-		if(\is_array($this->_editBehavior))
-			$this->_generateBehavior("edit",$this->_editBehavior,$js);
-		if(\is_array($this->_displayBehavior)){
-			$this->_generateBehavior("display",$this->_displayBehavior,$js);
+		if (\is_array($this->_deleteBehavior))
+			$this->_generateBehavior("delete", $this->_deleteBehavior, $js);
+		if (\is_array($this->_editBehavior))
+			$this->_generateBehavior("edit", $this->_editBehavior, $js);
+		if (\is_array($this->_displayBehavior)) {
+			$this->_generateBehavior("display", $this->_displayBehavior, $js);
 		}
 		parent::run($js);
-		if(isset($this->_pagination))
-			$this->_associatePaginationBehavior($js,$offset);
-		$this->_associateSearchFieldBehavior($js,$offset);
+		if (isset($this->_pagination))
+			$this->_associatePaginationBehavior($js, $offset);
+		$this->_associateSearchFieldBehavior($js, $offset);
 			
 	}
 
-	protected function _generateBehavior($op,$params,JsUtils $js){
-		if(isset($this->_urls[$op])){
-			$params=\array_merge($params,["attr"=>"data-ajax"]);
-			$js->ajaxOnClick("#".$this->identifier." ._".$op, $this->_urls[$op],$this->getTargetSelector($op),$params);
+	protected function _generateBehavior($op, $params, JsUtils $js) {
+		if (isset($this->_urls[$op])) {
+			$params=\array_merge($params, ["attr"=>"data-ajax"]);
+			$js->ajaxOnClick("#".$this->identifier." ._".$op, $this->_urls[$op], $this->getTargetSelector($op), $params);
 		}
 	}
 
@@ -90,34 +90,34 @@ 
 		return $this->content["table"];
 	}
 	
-	public function refreshTR(){
+	public function refreshTR() {
 		$this->getTable()->refreshTR();
 		return $this;
 	}
 	
-	public function refreshTD($fieldName,$jquery,$view){
+	public function refreshTD($fieldName, $jquery, $view) {
 		$index=$this->_getIndex($fieldName);
-		$this->compile($jquery,$view);
-		return $this->refreshTR()->getTable()->getCell(0,$index);
+		$this->compile($jquery, $view);
+		return $this->refreshTR()->getTable()->getCell(0, $index);
 	}
 	
 
 
-	public function compile(JsUtils $js=NULL,&$view=NULL){
-		if(!$this->_generated){
-			if(isset($this->_buttonsColumn)){
+	public function compile(JsUtils $js=NULL, &$view=NULL) {
+		if (!$this->_generated) {
+			if (isset($this->_buttonsColumn)) {
 				$this->_instanceViewer->sortColumnContent($this->_buttonsColumn, $this->_buttons);
 			}
 			$this->_instanceViewer->setInstance($this->_model);
 			$captions=$this->_instanceViewer->getCaptions();
 			$table=$this->content["table"];
-			if($this->_hasCheckboxes){
+			if ($this->_hasCheckboxes) {
 				$this->_generateMainCheckbox($captions);
 			}
 			$table->setRowCount(0, \sizeof($captions));
-			$this->_generateHeader($table,$captions);
+			$this->_generateHeader($table, $captions);
 
-			if(isset($this->_compileParts))
+			if (isset($this->_compileParts))
 				$table->setCompileParts($this->_compileParts);
 
 			$this->_generateContent($table);
@@ -125,158 +125,158 @@ 
 			$this->compileExtraElements($table, $captions);
 			$this->_compileSearchFieldBehavior($js);
 
-			$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->_applyStyleAttributes($table);
 			$this->_generated=true;
 		}
-		return parent::compile($js,$view);
+		return parent::compile($js, $view);
 	}
 
-	protected function compileExtraElements($table,$captions){
+	protected function compileExtraElements($table, $captions) {
 
-		if($this->_hasCheckboxes && $table->hasPart("thead")){
+		if ($this->_hasCheckboxes && $table->hasPart("thead")) {
 			$table->getHeader()->getCell(0, 0)->addClass("no-sort");
 		}
 
-		if(isset($this->_toolbar)){
+		if (isset($this->_toolbar)) {
 			$this->_setToolbarPosition($table, $captions);
 		}
-		if(isset($this->_pagination) && $this->_pagination->getVisible()){
+		if (isset($this->_pagination) && $this->_pagination->getVisible()) {
 			$this->_generatePagination($table);
 		}
 	}
 
-	protected function _applyStyleAttributes($table){
-		if(isset($this->_hiddenColumns))
+	protected function _applyStyleAttributes($table) {
+		if (isset($this->_hiddenColumns))
 			$this->_hideColumns();
-			if(isset($this->_colWidths)){
-				foreach ($this->_colWidths as $colIndex=>$width){
-					$table->setColWidth($colIndex,$width);
+			if (isset($this->_colWidths)) {
+				foreach ($this->_colWidths as $colIndex=>$width) {
+					$table->setColWidth($colIndex, $width);
 				}
 			}
 	}
 
-	protected function _hideColumns(){
-		foreach ($this->_hiddenColumns as $colIndex){
+	protected function _hideColumns() {
+		foreach ($this->_hiddenColumns as $colIndex) {
 			$this->_self->hideColumn($colIndex);
 		}
 		return $this;
 	}
 
-	protected function _generateHeader(HtmlTable $table,$captions){
+	protected function _generateHeader(HtmlTable $table, $captions) {
 		$table->setHeaderValues($captions);
-		if(isset($this->_sortable)){
+		if (isset($this->_sortable)) {
 			$table->setSortable($this->_sortable);
 		}
 	}
 
 
 
-	protected function _generateContent($table){
+	protected function _generateContent($table) {
 		$objects=$this->_modelInstance;
-		if(isset($this->_pagination)){
+		if (isset($this->_pagination)) {
 			$objects=$this->_pagination->getObjects($this->_modelInstance);
 		}
 			InstanceViewer::setIndex(0);
 			$fields=$this->_instanceViewer->getSimpleProperties();
 			$groupByFields=$this->_instanceViewer->getGroupByFields();
-			if(!is_array($groupByFields)){
-				$table->fromDatabaseObjects($objects, function($instance) use($table,$fields){
-					return $this->_generateRow($instance, $fields,$table);
+			if (!is_array($groupByFields)) {
+				$table->fromDatabaseObjects($objects, function($instance) use($table, $fields){
+					return $this->_generateRow($instance, $fields, $table);
 				});
-			}else{
+			} else {
 				$activeValues=array_combine($groupByFields, array_fill(0, sizeof($groupByFields), null));
 				$uuids=[];
-				$table->fromDatabaseObjects($objects, function($instance) use($table,$fields,&$activeValues,$groupByFields,&$uuids){
+				$table->fromDatabaseObjects($objects, function($instance) use($table, $fields, &$activeValues, $groupByFields, &$uuids){
 					$this->_instanceViewer->setInstance($instance);
-					foreach ($groupByFields as $index=>$gbField){
-						$this->_generateGroupByRow($index, $gbField, $table,$fields,$activeValues, $uuids);
+					foreach ($groupByFields as $index=>$gbField) {
+						$this->_generateGroupByRow($index, $gbField, $table, $fields, $activeValues, $uuids);
 					}
-					return $this->_generateRow($instance, $fields,$table,null,$uuids);
+					return $this->_generateRow($instance, $fields, $table, null, $uuids);
 				});
 			}
-		if($table->getRowCount()==0){
+		if ($table->getRowCount()==0) {
 			$result=$table->addRow();
 			$result->mergeRow();
 			$result->setValues([$this->_emptyMessage]);
 		}
 	}
 	
-	protected function _generateGroupByRow($index,$gbField,$table,$fields,&$activeValues,&$uuids){
+	protected function _generateGroupByRow($index, $gbField, $table, $fields, &$activeValues, &$uuids) {
 		$newValue=$this->_instanceViewer->getValue($gbField);
-		if($this->getElementContent($activeValues[$gbField])!==$this->getElementContent($newValue)){
-			if($index==0){
+		if ($this->getElementContent($activeValues[$gbField])!==$this->getElementContent($newValue)) {
+			if ($index==0) {
 				$uuids=[];
 			}
 			$uuid=uniqid("grp");
 			$uuids[$gbField]=$uuid;
 			$id=$this->_instanceViewer->getIdentifier();
-			$result=$table->addMergeRow(sizeof($fields)+1,$newValue);
+			$result=$table->addMergeRow(sizeof($fields)+1, $newValue);
 			$result->setIdentifier($this->identifier."-tr-gb-".$id);
-			$result->setProperty("data-ajax",$id);
-			$result->setProperty("data-group",$uuid);
-			$result->addToProperty("class",$this->_rowClass);
+			$result->setProperty("data-ajax", $id);
+			$result->setProperty("data-group", $uuid);
+			$result->addToProperty("class", $this->_rowClass);
 			$activeValues[$gbField]=$newValue;
 		}
 	}
 	
-	private function getElementContent($elm){
-		if($elm instanceof HtmlDoubleElement){
+	private function getElementContent($elm) {
+		if ($elm instanceof HtmlDoubleElement) {
 			return $elm->getTextContent();
 		}
 		return $elm;
 	}
 	
-	public function getFieldValue($index){
+	public function getFieldValue($index) {
 		$index=$this->_getIndex($index);
-		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 _generateRow($instance,$fields,&$table,$checkedClass=null,$uuids=null){
+	protected function _generateRow($instance, $fields, &$table, $checkedClass=null, $uuids=null) {
 		$this->_instanceViewer->setInstance($instance);
 		InstanceViewer::$index++;
-		$values= $this->_instanceViewer->getValues();
+		$values=$this->_instanceViewer->getValues();
 		$id=$this->_instanceViewer->getIdentifier();
 		$dataAjax=$id;
 		$id=$this->cleanIdentifier($id);
-		if($this->_hasCheckboxes){
-			$ck=new HtmlCheckbox("ck-".$this->identifier."-".$id,"");
+		if ($this->_hasCheckboxes) {
+			$ck=new HtmlCheckbox("ck-".$this->identifier."-".$id, "");
 			$checked=false;
-			if(isset($this->_checkedCallback)){
+			if (isset($this->_checkedCallback)) {
 				$func=$this->_checkedCallback;
 				$checked=$func($instance);
 			}
 			$ck->setChecked($checked);
 			$ck->setOnChange("event.stopPropagation();");
 			$field=$ck->getField();
-			$field->setProperty("value",$dataAjax);
+			$field->setProperty("value", $dataAjax);
 			$field->setProperty("name", "selection[]");
-			if(isset($checkedClass))
+			if (isset($checkedClass))
 				$field->setClass($checkedClass);
 			\array_unshift($values, $ck);
 		}
 		$result=$table->newRow();
 		$result->setIdentifier($this->identifier."-tr-".$id);
-		$result->setProperty("data-ajax",$dataAjax);
+		$result->setProperty("data-ajax", $dataAjax);
 		$result->setValues($values);
-		$result->addToProperty("class",$this->_rowClass);
+		$result->addToProperty("class", $this->_rowClass);
 		$result->setPropertyValues("data-field", $fields);
-		if(isset($uuids)){
-			$result->setProperty("data-child",implode(" ", $uuids));
+		if (isset($uuids)) {
+			$result->setProperty("data-child", implode(" ", $uuids));
 		}
 		return $result;
 	}
 
-	protected function _generatePagination($table){
-		if(isset($this->_toolbar)){
-			if($this->_toolbarPosition==PositionInTable::FOOTER)
+	protected function _generatePagination($table) {
+		if (isset($this->_toolbar)) {
+			if ($this->_toolbarPosition==PositionInTable::FOOTER)
 				$this->_toolbar->setFloated("left");
 		}
 		$footer=$table->getFooter();
@@ -284,51 +284,51 @@ 
 		$footer->addValues($this->_pagination->generateMenu($this->identifier));
 	}
 
-	protected function _associatePaginationBehavior(JsUtils $js=NULL,$offset=null){
-		if(isset($this->_urls["refresh"])){
+	protected function _associatePaginationBehavior(JsUtils $js=NULL, $offset=null) {
+		if (isset($this->_urls["refresh"])) {
 			$menu=$this->_pagination->getMenu();
-			if(isset($menu) && isset($js)){
-				$js->postOnClick("#".$menu->getIdentifier()." .item",$this->_urls["refresh"],"{'p':$(this).attr('data-page'),'_model':'".JString::doubleBackSlashes($this->_model)."'}",$this->getRefreshSelector(),["preventDefault"=>false,"jqueryDone"=>"replaceWith","hasLoader"=>false,"jsCallback"=>'$("#'.$this->identifier.'").trigger("pageChange");$("#'.$this->identifier.'").trigger("activeRowChange");']);
+			if (isset($menu) && isset($js)) {
+				$js->postOnClick("#".$menu->getIdentifier()." .item", $this->_urls["refresh"], "{'p':$(this).attr('data-page'),'_model':'".JString::doubleBackSlashes($this->_model)."'}", $this->getRefreshSelector(), ["preventDefault"=>false, "jqueryDone"=>"replaceWith", "hasLoader"=>false, "jsCallback"=>'$("#'.$this->identifier.'").trigger("pageChange");$("#'.$this->identifier.'").trigger("activeRowChange");']);
 				$page=URequest::post("p");
-				if(isset($page)){
+				if (isset($page)) {
 					$js->execAtLast('$("#'.$this->getIdentifier().' .pagination").children("a.item").removeClass("active");$("#'.$this->getIdentifier().' .pagination").children("a.item[data-page='.$page.']:not(.no-active)").addClass("active");');
 				}				
 			}
 		}
 	}
 	
-	protected function _compileSearchFieldBehavior(JsUtils $js=NULL){
-		if(isset($this->_searchField) && isset($js) && isset($this->_urls["refresh"])){
-			$this->_searchField->postOn("change", $this->_urls["refresh"],"{'s':$(self).val(),'_model':'".JString::doubleBackSlashes($this->_model)."'}","#".$this->identifier." tbody",["preventDefault"=>false,"jqueryDone"=>"replaceWith","hasLoader"=>"internal","jsCallback"=>'$("#'.$this->identifier.'").trigger("searchTerminate",[$(self).val()]);']);
+	protected function _compileSearchFieldBehavior(JsUtils $js=NULL) {
+		if (isset($this->_searchField) && isset($js) && isset($this->_urls["refresh"])) {
+			$this->_searchField->postOn("change", $this->_urls["refresh"], "{'s':$(self).val(),'_model':'".JString::doubleBackSlashes($this->_model)."'}", "#".$this->identifier." tbody", ["preventDefault"=>false, "jqueryDone"=>"replaceWith", "hasLoader"=>"internal", "jsCallback"=>'$("#'.$this->identifier.'").trigger("searchTerminate",[$(self).val()]);']);
 		}
 	}
-	protected function _associateSearchFieldBehavior(JsUtils $js=NULL,$offset=null){
+	protected function _associateSearchFieldBehavior(JsUtils $js=NULL, $offset=null) {
 		
 	}
 
-	protected function _getFieldName($index){
+	protected function _getFieldName($index) {
 		$fieldName=parent::_getFieldName($index);
-		if(\is_object($fieldName))
+		if (\is_object($fieldName))
 			$fieldName="field-".$index;
 		return $fieldName."[]";
 	}
 
-	protected function _getFieldCaption($index){
+	protected function _getFieldCaption($index) {
 		return null;
 	}
 
-	protected function _setToolbarPosition($table,$captions=NULL){
-		switch ($this->_toolbarPosition){
+	protected function _setToolbarPosition($table, $captions=NULL) {
+		switch ($this->_toolbarPosition) {
 			case PositionInTable::BEFORETABLE:
 			case PositionInTable::AFTERTABLE:
-				if(isset($this->_compileParts)===false){
+				if (isset($this->_compileParts)===false) {
 					$this->content[$this->_toolbarPosition]=$this->_toolbar;
 				}
 				break;
 			case PositionInTable::HEADER:
 			case PositionInTable::FOOTER:
 			case PositionInTable::BODY:
-				$this->addToolbarRow($this->_toolbarPosition,$table, $captions);
+				$this->addToolbarRow($this->_toolbarPosition, $table, $captions);
 				break;
 		}
 	}
@@ -340,16 +340,16 @@ 
 	 * @param callable $callback function called after the field compilation
 	 * @return DataTable
 	 */
-	public function afterCompile($index,$callback){
-		$this->_instanceViewer->afterCompile($index,$callback);
+	public function afterCompile($index, $callback) {
+		$this->_instanceViewer->afterCompile($index, $callback);
 		return $this;
 	}
 
-	private function addToolbarRow($part,$table,$captions){
+	private function addToolbarRow($part, $table, $captions) {
 		$hasPart=$table->hasPart($part);
-		if($hasPart){
+		if ($hasPart) {
 			$row=$table->getPart($part)->addRow(\sizeof($captions));
-		}else{
+		} else {
 			$row=$table->getPart($part)->getRow(0);
 		}
 		$row->mergeCol();
@@ -361,7 +361,7 @@ 
 	 * @see Widget::getHtmlComponent()
 	 * @return HtmlTable
 	 */
-	public function getHtmlComponent(){
+	public function getHtmlComponent() {
 		return $this->content["table"];
 	}
 
@@ -376,13 +376,13 @@ 
 	 * @return DataTable
 	 */
 	public function setUrls($urls) {
-		if(\is_array($urls)){
-			$this->_urls["refresh"]=JArray::getValue($urls, "refresh",0);
-			$this->_urls["edit"]=JArray::getValue($urls, "edit",1);
-			$this->_urls["delete"]=JArray::getValue($urls, "delete",2);
-			$this->_urls["display"]=JArray::getValue($urls, "display",3);
-		}else{
-			$this->_urls=["refresh"=>$urls,"edit"=>$urls,"delete"=>$urls,"display"=>$urls];
+		if (\is_array($urls)) {
+			$this->_urls["refresh"]=JArray::getValue($urls, "refresh", 0);
+			$this->_urls["edit"]=JArray::getValue($urls, "edit", 1);
+			$this->_urls["delete"]=JArray::getValue($urls, "delete", 2);
+			$this->_urls["display"]=JArray::getValue($urls, "display", 3);
+		} else {
+			$this->_urls=["refresh"=>$urls, "edit"=>$urls, "delete"=>$urls, "display"=>$urls];
 		}
 		return $this;
 	}
@@ -395,8 +395,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){
-		$this->_pagination=new Pagination($items_per_page,$pages_visibles,$page,$total_rowcount);
+	public function paginate($page, $total_rowcount, $items_per_page=10, $pages_visibles=null) {
+		$this->_pagination=new Pagination($items_per_page, $pages_visibles, $page, $total_rowcount);
 		return $this;
 	}
 
@@ -407,8 +407,8 @@ 
 	 * @param number $pages_visibles The number of visible pages in the Pagination component
 	 * @return DataTable
 	 */
-	public function autoPaginate($page=1,$items_per_page=10,$pages_visibles=4){
-		$this->_pagination=new Pagination($items_per_page,$pages_visibles,$page);
+	public function autoPaginate($page=1, $items_per_page=10, $pages_visibles=4) {
+		$this->_pagination=new Pagination($items_per_page, $pages_visibles, $page);
 		return $this;
 	}
 
@@ -418,7 +418,7 @@ 
 	 * @param array $compileParts
 	 * @return DataTable
 	 */
-	public function refresh($compileParts=["tbody"]){
+	public function refresh($compileParts=["tbody"]) {
 		$this->_compileParts=$compileParts;
 		return $this;
 	}
@@ -429,14 +429,14 @@ 
 	 * @param string $position
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
-	public function addSearchInToolbar($position=Direction::RIGHT){
+	public function addSearchInToolbar($position=Direction::RIGHT) {
 		return $this->addInToolbar($this->getSearchField())->setPosition($position);
 	}
 
-	public function getSearchField(){
-		if(isset($this->_searchField)===false){
-			$this->_searchField=new HtmlInput("search-".$this->identifier,"search","","Search...");
-			$this->_searchField->addIcon("search",Direction::RIGHT);
+	public function getSearchField() {
+		if (isset($this->_searchField)===false) {
+			$this->_searchField=new HtmlInput("search-".$this->identifier, "search", "", "Search...");
+			$this->_searchField->addIcon("search", Direction::RIGHT);
 		}
 		return $this->_searchField;
 	}
@@ -456,7 +456,7 @@ 
 	 * Returns a form corresponding to the Datatable
 	 * @return \Ajax\semantic\html\collections\form\HtmlForm
 	 */
-	public function asForm(){
+	public function asForm() {
 		return $this->getForm();
 	}
 
@@ -464,7 +464,7 @@ 
 
 	protected function getTargetSelector($op) {
 		$result=$this->_targetSelector;
-		if(!isset($result[$op]))
+		if (!isset($result[$op]))
 			$result="#".$this->identifier;
 		return $result[$op];
 	}
@@ -475,15 +475,15 @@ 
 	 * @return DataTable
 	 */
 	public function setTargetSelector($_targetSelector) {
-		if(!\is_array($_targetSelector)){
-			$_targetSelector=["edit"=>$_targetSelector,"delete"=>$_targetSelector];
+		if (!\is_array($_targetSelector)) {
+			$_targetSelector=["edit"=>$_targetSelector, "delete"=>$_targetSelector];
 		}
 		$this->_targetSelector=$_targetSelector;
 		return $this;
 	}
 
 	public function getRefreshSelector() {
-		if(isset($this->_refreshSelector))
+		if (isset($this->_refreshSelector))
 			return $this->_refreshSelector;
 		return "#".$this->identifier." tbody";
 	}
@@ -501,9 +501,9 @@ 
 	 * {@inheritDoc}
 	 * @see \Ajax\common\Widget::show()
 	 */
-	public function show($modelInstance){
-		if(\is_array($modelInstance)){
-			if(isset($modelInstance[0]) && \is_array(array_values($modelInstance)[0]))
+	public function show($modelInstance) {
+		if (\is_array($modelInstance)) {
+			if (isset($modelInstance[0]) && \is_array(array_values($modelInstance)[0]))
 				$modelInstance=\json_decode(\json_encode($modelInstance), FALSE);
 		}
 		$this->_modelInstance=$modelInstance;
@@ -538,37 +538,37 @@ 
 		return $this;
 	}
 
-	public function setActiveRowSelector($class="active",$event="click",$multiple=false){
-		$this->_self->setActiveRowSelector($class,$event,$multiple);
+	public function setActiveRowSelector($class="active", $event="click", $multiple=false) {
+		$this->_self->setActiveRowSelector($class, $event, $multiple);
 		return $this;
 	}
 
-	public function hideColumn($colIndex){
-		if(!\is_array($this->_hiddenColumns))
+	public function hideColumn($colIndex) {
+		if (!\is_array($this->_hiddenColumns))
 			$this->_hiddenColumns=[];
 		$this->_hiddenColumns[]=$colIndex;
 		return $this;
 	}
 
-	public function setColWidth($colIndex,$width){
+	public function setColWidth($colIndex, $width) {
 		$this->_colWidths[$colIndex]=$width;
 		return $this;
 	}
 	public function setColWidths($_colWidths) {
-		$this->_colWidths = $_colWidths;
+		$this->_colWidths=$_colWidths;
 		return $this;
 	}
 
-	public function setColAlignment($colIndex,$alignment){
-		$this->content["table"]->setColAlignment($colIndex,$alignment);
+	public function setColAlignment($colIndex, $alignment) {
+		$this->content["table"]->setColAlignment($colIndex, $alignment);
 		return $this;
 	}
 	
-	public function trigger($event,$params="[]"){
-		return $this->getHtmlComponent()->trigger($event,$params);
+	public function trigger($event, $params="[]") {
+		return $this->getHtmlComponent()->trigger($event, $params);
 	}
 	
-	public function onActiveRowChange($jsCode){
+	public function onActiveRowChange($jsCode) {
 		$this->getHtmlComponent()->onActiveRowChange($jsCode);
 		return $this;
 	}
@@ -596,7 +596,7 @@ 
 	 * @param mixed $_displayBehavior
 	 */
 	public function setDisplayBehavior($_displayBehavior) {
-		$this->_displayBehavior = $_displayBehavior;
+		$this->_displayBehavior=$_displayBehavior;
 	}
 	/**
 	 * @return mixed

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/widgets/dataform/DataForm.php

Spacing +39 added lines, -39 removed lines

@@ -21,36 +21,36 @@ 
 	use BaseTrait;
 
 	public function __construct($identifier, $modelInstance=NULL) {
-		parent::__construct($identifier, null,$modelInstance);
+		parent::__construct($identifier, null, $modelInstance);
 		$this->_form=new HtmlForm($identifier);
 		$this->_init(new FormInstanceViewer($identifier), "form", $this->_form, true);
 	}
 
-	protected function _getFieldIdentifier($prefix,$name=""){
+	protected function _getFieldIdentifier($prefix, $name="") {
 		return $this->identifier."-{$name}-".$this->_instanceViewer->getIdentifier();
 	}
 
-	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);
 
 			$form=$this->content["form"];
 			$this->_generateContent($form);
 
-			if(isset($this->_toolbar)){
+			if (isset($this->_toolbar)) {
 				$this->_setToolbarPosition($form);
 			}
-			$this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE,"form",PositionInTable::AFTERTABLE]);
+			$this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE, "form", PositionInTable::AFTERTABLE]);
 			$this->_generated=true;
 		}
-		return parent::compile($js,$view);
+		return parent::compile($js, $view);
 	}
 
 	/**
 	 * @param HtmlForm $form
 	 */
-	protected function _generateContent($form){
-		$values= $this->_instanceViewer->getValues();
+	protected function _generateContent($form) {
+		$values=$this->_instanceViewer->getValues();
 		$count=$this->_instanceViewer->count();
 		$separators=$this->_instanceViewer->getSeparators();
 		$headers=$this->_instanceViewer->getHeaders();
@@ -58,41 +58,41 @@ 
 		\sort($separators);
 		$size=\sizeof($separators);
 		$nb=0;
-		if($size===1){
+		if ($size===1) {
 			$i=-1;
-			foreach ($values as $v){
-				$this->_generateFields($form, [$v], $headers, $i, $wrappers,$nb++);
+			foreach ($values as $v) {
+				$this->_generateFields($form, [$v], $headers, $i, $wrappers, $nb++);
 				$i++;
 			}
-		}else{
+		} else {
 			$separators[]=$count;
-			for($i=0;$i<$size;$i++){
-				$fields=\array_slice($values, $separators[$i]+1,$separators[$i+1]-$separators[$i]);
-				$this->_generateFields($form, $fields, $headers, $separators[$i], $wrappers,$nb++);
+			for ($i=0; $i<$size; $i++) {
+				$fields=\array_slice($values, $separators[$i]+1, $separators[$i+1]-$separators[$i]);
+				$this->_generateFields($form, $fields, $headers, $separators[$i], $wrappers, $nb++);
 			}
 		}
-		if($this->_hasRules && !$this->getForm()->hasValidationParams()){
+		if ($this->_hasRules && !$this->getForm()->hasValidationParams()) {
 				$this->setValidationParams(["inline"=>true]);
 		}
 	}
 
-	protected function _generateFields($form,$values,$headers,$sepFirst,$wrappers,$nb){
+	protected function _generateFields($form, $values, $headers, $sepFirst, $wrappers, $nb) {
 		$wrapper=null;
-		if(isset($headers[$sepFirst+1]))
-			$form->addHeader($headers[$sepFirst+1],4,true);
-		if(isset($wrappers[$sepFirst+1])){
+		if (isset($headers[$sepFirst+1]))
+			$form->addHeader($headers[$sepFirst+1], 4, true);
+		if (isset($wrappers[$sepFirst+1])) {
 			$wrapper=$wrappers[$sepFirst+1];
 		}
-		if(\sizeof($values)===1){
+		if (\sizeof($values)===1) {
 			$added=$form->addField($values[0]);
-		}elseif(\sizeof($values)>1){
+		}elseif (\sizeof($values)>1) {
 			$added=$form->addFields($values);
-		}else
+		} else
 			return;
-		if(isset($wrapper)){
-			$added->wrap($wrapper[0],$wrapper[1]);
+		if (isset($wrapper)) {
+			$added->wrap($wrapper[0], $wrapper[1]);
 		}
-		$this->execHook("onGenerateFields",$added,$nb);
+		$this->execHook("onGenerateFields", $added, $nb);
 	}
 	
 	/**
@@ -100,18 +100,18 @@ 
 	 * the generated field is the first parameter
 	 * @param callable $callback the fonction to call when a field is generated
 	 */
-	public function onGenerateField($callback){
-		$this->addHook("onGenerateFields",$callback);
+	public function onGenerateField($callback) {
+		$this->addHook("onGenerateFields", $callback);
 	}
 
 	/**
 	 * @return HtmlForm
 	 */
-	public function getForm(){
+	public function getForm() {
 		return $this->content["form"];
 	}
 
-	public function addSeparatorAfter($fieldNum){
+	public function addSeparatorAfter($fieldNum) {
 		$fieldNum=$this->_getIndex($fieldNum);
 		$this->_instanceViewer->addSeparatorAfter($fieldNum);
 		return $this;
@@ -126,12 +126,12 @@ 
 		return $this;
 	}
 
-	public function fieldAsReset($index,$cssStyle=NULL,$attributes=NULL){
-		return $this->_fieldAs(function($id,$name,$value) use ($cssStyle){
-			$button=new HtmlButton($id,$value,$cssStyle);
+	public function fieldAsReset($index, $cssStyle=NULL, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value) use ($cssStyle){
+			$button=new HtmlButton($id, $value, $cssStyle);
 			$button->setProperty("type", "reset");
 			return $button;
-		}, $index,$attributes);
+		}, $index, $attributes);
 	}
 
 	/**
@@ -150,19 +150,19 @@ 
 		$this->content[$this->_toolbarPosition]=$this->_toolbar;
 	}
 
-	public function addDividerBefore($index,$title){
+	public function addDividerBefore($index, $title) {
 		$index=$this->_getIndex($index);
 		$this->_instanceViewer->addHeaderDividerBefore($index, $title);
 		return $this;
 	}
 
-	public function addWrapper($index,$contentBefore,$contentAfter=null){
+	public function addWrapper($index, $contentBefore, $contentAfter=null) {
 		$index=$this->_getIndex($index);
-		$this->_instanceViewer->addWrapper($index, $contentBefore,$contentAfter);
+		$this->_instanceViewer->addWrapper($index, $contentBefore, $contentAfter);
 		return $this;
 	}
 
-	public function run(JsUtils $js){
+	public function run(JsUtils $js) {
 		parent::run($js);
 	}
 }

Ajax/semantic/html/collections/table/HtmlTable.php

Spacing +49 added lines, -49 removed lines

@@ -31,10 +31,10 @@ 
 
 	public function __construct($identifier, $rowCount, $colCount) {
 		parent::__construct($identifier, "table", "ui table");
-		$this->content=array ();
+		$this->content=array();
 		$this->setRowCount($rowCount, $colCount);
-		$this->_variations=[ Variation::CELLED,Variation::PADDED,Variation::COMPACT ];
-		$this->_compileParts=["thead","tbody","tfoot"];
+		$this->_variations=[Variation::CELLED, Variation::PADDED, Variation::COMPACT];
+		$this->_compileParts=["thead", "tbody", "tfoot"];
 		$this->_afterCompileEvents=[];
 	}
 
@@ -44,17 +44,17 @@ 
 	 * @return HtmlTableContent
 	 */
 	public function getPart($key) {
-		if (\array_key_exists($key, $this->content) === false) {
+		if (\array_key_exists($key, $this->content)===false) {
 			$this->content[$key]=new HtmlTableContent("", $key);
-			if ($key !== "tbody") {
+			if ($key!=="tbody") {
 				$this->content[$key]->setRowCount(1, $this->_colCount);
 			}
 		}
 		return $this->content[$key];
 	}
 
-	protected function _getFirstPart(){
-		if(isset($this->content["thead"])){
+	protected function _getFirstPart() {
+		if (isset($this->content["thead"])) {
 			return $this->content["thead"];
 		}
 		return $this->content["tbody"];
@@ -99,7 +99,7 @@ 
 	 * @return boolean
 	 */
 	public function hasPart($key) {
-		return \array_key_exists($key, $this->content) === true;
+		return \array_key_exists($key, $this->content)===true;
 	}
 
 	/**
@@ -259,8 +259,8 @@ 
 		return $this->colAlign($colIndex, "colLeftFromRight");
 	}
 
-	public function setColAlignment($colIndex,$alignment){
-		switch ($alignment){
+	public function setColAlignment($colIndex, $alignment) {
+		switch ($alignment) {
 			case TextAlignment::LEFT:
 				$function="colLeft";
 				break;
@@ -280,8 +280,8 @@ 
 		return $this;
 	}
 	
-	public function setColAlignmentFromRight($colIndex,$alignment){
-		switch ($alignment){
+	public function setColAlignmentFromRight($colIndex, $alignment) {
+		switch ($alignment) {
 			case TextAlignment::LEFT:
 				$function="colLeftFromRight";
 				break;
@@ -303,7 +303,7 @@ 
 
 	private function colAlign($colIndex, $function) {
 		if (\is_array($colIndex)) {
-			foreach ( $colIndex as $cIndex ) {
+			foreach ($colIndex as $cIndex) {
 				$this->colAlign($cIndex, $function);
 			}
 		} else {
@@ -364,7 +364,7 @@ 
 	 * @see HtmlSemDoubleElement::compile()
 	 */
 	public function compile(JsUtils $js=NULL, &$view=NULL) {
-		if(\sizeof($this->_compileParts)<3){
+		if (\sizeof($this->_compileParts)<3) {
 			$this->_template="%content%";
 			$this->refresh($js);
 		}
@@ -373,9 +373,9 @@ 
 	}
 
 	protected function compile_once(JsUtils $js=NULL, &$view=NULL) {
-		parent::compile_once($js,$view);
+		parent::compile_once($js, $view);
 		if ($this->propertyContains("class", "sortable")) {
-			$this->addEvent("execute", "$('#" . $this->identifier . "').tablesort().data('tablesort').sort($('th.default-sort'));");
+			$this->addEvent("execute", "$('#".$this->identifier."').tablesort().data('tablesort').sort($('th.default-sort'));");
 		}
 	}
 
@@ -388,13 +388,13 @@ 
 	public function fromDatabaseObject($object, $function) {
 		$result=$function($object);
 		if (\is_array($result)) {
-			$result= $this->addRow($function($object));
+			$result=$this->addRow($function($object));
 		} else {
-			$result= $this->getBody()->_addRow($result);
+			$result=$this->getBody()->_addRow($result);
 		}
-		if(isset($this->_afterCompileEvents["onNewRow"])){
-			if(\is_callable($this->_afterCompileEvents["onNewRow"]))
-				$this->_afterCompileEvents["onNewRow"]($result,$object);
+		if (isset($this->_afterCompileEvents["onNewRow"])) {
+			if (\is_callable($this->_afterCompileEvents["onNewRow"]))
+				$this->_afterCompileEvents["onNewRow"]($result, $object);
 		}
 		return $result;
 	}
@@ -409,26 +409,26 @@ 
 		return $this;
 	}
 	
-	public function refreshTR(){
+	public function refreshTR() {
 		$this->setCompileParts();
 		$this->getPart("tbody")->refreshTR();
 	}
 
-	public function refresh($js){
+	public function refresh($js) {
 		$this->_footer=$this->getFooter();
-		if(isset($js)){
-			$js->exec('$("#'.$this->identifier.' tfoot").replaceWith("'.\addslashes($this->_footer).'");',true);
+		if (isset($js)) {
+			$js->exec('$("#'.$this->identifier.' tfoot").replaceWith("'.\addslashes($this->_footer).'");', true);
 		}
 	}
 
-	public function run(JsUtils $js){
-		if(!$this->_runned){
-			if(isset($this->_activeRowSelector)){
+	public function run(JsUtils $js) {
+		if (!$this->_runned) {
+			if (isset($this->_activeRowSelector)) {
 				$this->_activeRowSelector->run();
 			}
 		}
-		$result= parent::run($js);
-		if(isset($this->_footer))
+		$result=parent::run($js);
+		if (isset($this->_footer))
 			$this->_footer->run($js);
 		$this->_runned=true;
 		return $result;
@@ -452,47 +452,47 @@ 
 	 * @param boolean $multiple
 	 * @return HtmlTable
 	 */
-	public function setActiveRowSelector($class="active",$event="click",$multiple=false){
-		$this->_activeRowSelector=new ActiveRow($this,$class,$event,$multiple);
+	public function setActiveRowSelector($class="active", $event="click", $multiple=false) {
+		$this->_activeRowSelector=new ActiveRow($this, $class, $event, $multiple);
 		return $this;
 	}
 
-	public function hideColumn($colIndex){
-		if(isset($this->content["thead"])){
+	public function hideColumn($colIndex) {
+		if (isset($this->content["thead"])) {
 			$this->content["thead"]->hideColumn($colIndex);
 		}
 		$this->content["tbody"]->hideColumn($colIndex);
-		if(isset($this->content["tfoot"])){
+		if (isset($this->content["tfoot"])) {
 			$this->content["tfoot"]->hideColumn($colIndex);
 		}
 		return $this;
 	}
 
-	public function setColWidth($colIndex,$width){
+	public function setColWidth($colIndex, $width) {
 		$part=$this->_getFirstPart();
-		if($part!==null && $part->count()>0)
+		if ($part!==null && $part->count()>0)
 			$part->getCell(0, $colIndex)->setWidth($width);
 		return $this;
 	}
 
-	public function setColWidths($widths){
+	public function setColWidths($widths) {
 		$part=$this->_getFirstPart();
-		if($part!==null && $part->count()>0){
+		if ($part!==null && $part->count()>0) {
 			$count=$part->getColCount();
-			if(!\is_array($widths)){
+			if (!\is_array($widths)) {
 				$widths=\array_fill(0, $count, $widths);
 			}
-			$max=\min(\sizeof($widths),$count);
-			for($i=0;$i<$max;$i++){
+			$max=\min(\sizeof($widths), $count);
+			for ($i=0; $i<$max; $i++) {
 				$part->getCell(0, $i)->setWidth($widths[$i]);
 			}
 		}
 		return $this;
 	}
 
-	public function mergeIdentiqualValues($colIndex,$function="strip_tags"){
+	public function mergeIdentiqualValues($colIndex, $function="strip_tags") {
 		$body=$this->getBody();
-		$body->mergeIdentiqualValues($colIndex,$function);
+		$body->mergeIdentiqualValues($colIndex, $function);
 		return $this;
 	}
 	/**
@@ -506,16 +506,16 @@ 
 	 * @param mixed $_innerScript
 	 */
 	public function setInnerScript($_innerScript) {
-		$this->_innerScript = $_innerScript;
+		$this->_innerScript=$_innerScript;
 	}
 	
-	public function onActiveRowChange($jsCode){
-		$this->on("activeRowChange",$jsCode);
+	public function onActiveRowChange($jsCode) {
+		$this->on("activeRowChange", $jsCode);
 		return $this;
 	}
 	
-	public function addMergeRow($colCount,$value=null){
-		return $this->getBody()->addMergeRow($colCount,$value);
+	public function addMergeRow($colCount, $value=null) {
+		return $this->getBody()->addMergeRow($colCount, $value);
 	}
 
 }

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

Spacing +18 added lines, -18 removed lines

@@ -8,12 +8,12 @@ 
  * @author jc
  * @property HtmlTable $_self
  */
-trait TableTrait{
+trait TableTrait {
 
 	abstract public function addEvent($event, $jsCode, $stopPropagation=false, $preventDefault=false);
 	abstract public function getOn($event, $url, $responseElement="", $parameters=array());
 	
-	protected function addToPropertyTable($property,$value){
+	protected function addToPropertyTable($property, $value) {
 		return $this->_self->addToProperty($property, $value);
 	}
 
@@ -24,15 +24,15 @@ 
 	public function setBasic($very=false) {
 		$table=$this->_self;
 		if ($very)
-			$table->addToPropertyCtrl("class", "very", array ("very" ));
-		return $table->addToPropertyCtrl("class", "basic", array ("basic" ));
+			$table->addToPropertyCtrl("class", "very", array("very"));
+		return $table->addToPropertyCtrl("class", "basic", array("basic"));
 	}
 
 	public function setCompact($very=false) {
 		$table=$this->_self;
 		if ($very)
-			$table->addToPropertyCtrl("class", "very", array ("very" ));
-		return $table->addToPropertyCtrl("class", "compact", array ("compact" ));
+			$table->addToPropertyCtrl("class", "very", array("very"));
+		return $table->addToPropertyCtrl("class", "compact", array("compact"));
 	}
 
 	public function setCollapsing() {
@@ -71,41 +71,41 @@ 
 		return $this->addToPropertyTable("class", "striped");
 	}
 
-	public function onRowClick($jsCode, $stopPropagation=false, $preventDefault=false){
-		return $this->onRow("click", $jsCode,$stopPropagation,$preventDefault);
+	public function onRowClick($jsCode, $stopPropagation=false, $preventDefault=false) {
+		return $this->onRow("click", $jsCode, $stopPropagation, $preventDefault);
 	}
 
-	public function onRow($event,$jsCode, $stopPropagation=false, $preventDefault=false){
-		return $this->_self->addEvent($event."{{tbody tr}}",$jsCode,$stopPropagation,$preventDefault);
+	public function onRow($event, $jsCode, $stopPropagation=false, $preventDefault=false) {
+		return $this->_self->addEvent($event."{{tbody tr}}", $jsCode, $stopPropagation, $preventDefault);
 	}
 
-	public function getOnRow($event, $url, $responseElement="", $parameters=array()){
-		$parameters=\array_merge($parameters,["stopPropagation"=>false,"preventDefault"=>false,"jsCondition"=>'!$(this).closest("tr").hasClass("active")']);
+	public function getOnRow($event, $url, $responseElement="", $parameters=array()) {
+		$parameters=\array_merge($parameters, ["stopPropagation"=>false, "preventDefault"=>false, "jsCondition"=>'!$(this).closest("tr").hasClass("active")']);
 		$selector="tbody tr";
-		if(isset($parameters["selector"])){
+		if (isset($parameters["selector"])) {
 			$selector=$parameters["selector"];
 		}
-		return $this->_self->getOn($event."{{".$selector."}}", $url,$responseElement,$parameters);
+		return $this->_self->getOn($event."{{".$selector."}}", $url, $responseElement, $parameters);
 	}
 	
-	public function onPageChange($jsCode){
+	public function onPageChange($jsCode) {
 		$this->_self->_addEvent("pageChange", $jsCode);
 		return $this;
 	}
 	
-	public function onSearchTerminate($jsCode){
+	public function onSearchTerminate($jsCode) {
 		$this->_self->_addEvent("searchTerminate", $jsCode);
 		return $this;
 	}
 	
-	public function getEventsScript(){
+	public function getEventsScript() {
 		return $this->_self->getBsComponent()->getScript();
 	}
 	
 	public function addEventsOnRun(JsUtils $js=NULL) {
 		$script=parent::addEventsOnRun($js);
 		$innerScript=$this->_self->getInnerScript();
-		if(!isset($innerScript)){
+		if (!isset($innerScript)) {
 			$this->_self->setInnerScript($script);
 		}
 		return $script;

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

Spacing +25 added lines, -25 removed lines

@@ -19,7 +19,7 @@ 
 
 	abstract public function addToProperty($name, $value, $separator=" ");
 	abstract public function addLabel($caption, $style="label-default", $leftSeparator=" ");
-	abstract public function addContent($content,$before=false);
+	abstract public function addContent($content, $before=false);
 	abstract public function getField();
 	abstract public function getDataField();
 
@@ -28,7 +28,7 @@ 
 	}
 
 	public function addLoading() {
-		if ($this->_hasIcon === false) {
+		if ($this->_hasIcon===false) {
 			throw new \Exception("Input must have an icon for showing a loader, use addIcon before");
 		}
 		return $this->addToProperty("class", State::LOADING);
@@ -42,8 +42,8 @@ 
 	 */
 	public function labeled($label, $direction=Direction::LEFT, $icon=NULL) {
 		$field=$this->getField();
-		$labelO=$field->addLabel($label,$direction===Direction::LEFT,$icon);
-		$field->addToProperty("class", $direction . " labeled");
+		$labelO=$field->addLabel($label, $direction===Direction::LEFT, $icon);
+		$field->addToProperty("class", $direction." labeled");
 		return $labelO;
 	}
 
@@ -54,8 +54,8 @@ 
 	 * @param string $checkboxType
 	 * @return HtmlLabel
 	 */
-	public function labeledCheckbox($direction=Direction::LEFT,$caption="",$value=NULL,$checkboxType=NULL){
-		return $this->labeled(new HtmlCheckbox("lbl-ck-".$this->getField()->getIdentifier(),$caption,$value,$checkboxType),$direction);
+	public function labeledCheckbox($direction=Direction::LEFT, $caption="", $value=NULL, $checkboxType=NULL) {
+		return $this->labeled(new HtmlCheckbox("lbl-ck-".$this->getField()->getIdentifier(), $caption, $value, $checkboxType), $direction);
 	}
 
 	/**
@@ -64,7 +64,7 @@ 
 	 * @return HtmlLabel
 	 */
 	public function labeledToCorner($icon, $direction=Direction::LEFT) {
-		return $this->labeled("", $direction . " corner", $icon)->toCorner($direction);
+		return $this->labeled("", $direction." corner", $icon)->toCorner($direction);
 	}
 
 	/**
@@ -77,13 +77,13 @@ 
 	public function addAction($action, $direction=Direction::RIGHT, $icon=NULL, $labeled=false) {
 		$field=$this->getField();
 		$actionO=$action;
-		if (\is_object($action) === false) {
-			$actionO=new HtmlButton("action-" . $this->identifier, $action);
+		if (\is_object($action)===false) {
+			$actionO=new HtmlButton("action-".$this->identifier, $action);
 			if (isset($icon))
 				$actionO->addIcon($icon, true, $labeled);
 		}
-		$field->addToProperty("class", $direction . " action");
-		$field->addContent($actionO, \strstr($direction, Direction::LEFT) !== false);
+		$field->addToProperty("class", $direction." action");
+		$field->addContent($actionO, \strstr($direction, Direction::LEFT)!==false);
 		return $actionO;
 	}
 
@@ -93,50 +93,50 @@ 
 	 * @param string $direction
 	 * @return HtmlLabel
 	 */
-	public function addDropdown($label="", $items=array(),$direction=Direction::RIGHT){
-		$labelO=new HtmlDropdown("dd-".$this->identifier,$label,$items);
-		$labelO->asSelect("select-".$this->identifier,false,true);
-		return $this->labeled($labelO,$direction);
+	public function addDropdown($label="", $items=array(), $direction=Direction::RIGHT) {
+		$labelO=new HtmlDropdown("dd-".$this->identifier, $label, $items);
+		$labelO->asSelect("select-".$this->identifier, false, true);
+		return $this->labeled($labelO, $direction);
 	}
 
 	public function setTransparent() {
 		return $this->getField()->addToProperty("class", "transparent");
 	}
 
-	public function setReadonly(){
+	public function setReadonly() {
 		$this->getDataField()->setProperty("readonly", "");
 		return $this;
 	}
 
-	public function setName($name){
-		$this->getDataField()->setProperty("name",$name);
+	public function setName($name) {
+		$this->getDataField()->setProperty("name", $name);
 		return $this;
 	}
 
-	public function setFluid(){
-		$this->getField()->addToProperty("class","fluid");
+	public function setFluid() {
+		$this->getField()->addToProperty("class", "fluid");
 		return $this;
 	}
 
 	public function setDisabled($disable=true) {
 		$field=$this->getField();
-		if($disable)
+		if ($disable)
 			$field->addToProperty("class", "disabled");
 		return $this;
 	}
 	
-	public function setJsContent($content){
+	public function setJsContent($content) {
 		$id="";
 		$field=$this->getDataField();
-		if(isset($field)){
+		if (isset($field)) {
 			$id=$field->getIdentifier();
 		}
-		if($id!==''){
+		if ($id!=='') {
 			return '$("#'.$id.'").val('.$content.')';
 		}
 	}
 	
-	public function getJsContent(){
+	public function getJsContent() {
 		return $this->setJsContent("");
 	}
 }

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));
 	}
 }