phpMv / phpMv-UI

Ajax/common/html/PropertyWrapper.php

Spacing +15 added lines, -15 removed lines

@@ -12,8 +12,8 @@ 
 		}
 		$output="";
 		if (\is_array($input)) {
-			if (sizeof($input) > 0) {
-				if (self::containsElement($input) === false) {
+			if (sizeof($input)>0) {
+				if (self::containsElement($input)===false) {
 					$output=self::wrapStrings($input, $separator=' ', $valueQuote='"');
 				} else {
 					$output=self::wrapObjects($input, $js, $view, $separator, $valueQuote);
@@ -24,7 +24,7 @@ 
 	}
 
 	private static function containsElement($input) {
-		foreach ( $input as $v ) {
+		foreach ($input as $v) {
 			if (\is_object($v) || \is_array($v))
 				return true;
 		}
@@ -32,9 +32,9 @@ 
 	}
 
 	public static function wrapStrings($input, $separator=' ', $valueQuote='"') {
-		if (JArray::isAssociative($input) === true) {
-			$result=implode($separator, array_map(function ($v, $k) use($valueQuote) {
-				return $k . '=' . $valueQuote . $v . $valueQuote;
+		if (JArray::isAssociative($input)===true) {
+			$result=implode($separator, array_map(function($v, $k) use($valueQuote) {
+				return $k.'='.$valueQuote.$v.$valueQuote;
 			}, $input, array_keys($input)));
 		} else {
 			$result=implode($separator, $input);
@@ -43,30 +43,30 @@ 
 	}
 
 	public static function wrapObjects($input, $js=NULL, $view=null, $separator=' ', $valueQuote='"') {
-		return implode($separator, array_map(function ($v) use($js, $view,$separator, $valueQuote) {
-			if(\is_string($v)){
+		return implode($separator, array_map(function($v) use($js, $view, $separator, $valueQuote) {
+			if (\is_string($v)) {
 				return $v;
 			}
-			if ($v instanceof BaseHtml){
-				return $v->compile($js,$view);
+			if ($v instanceof BaseHtml) {
+				return $v->compile($js, $view);
 			}
 			if (\is_array($v)) {
-				return self::wrap($v, $js, $view,$separator, $valueQuote);
+				return self::wrap($v, $js, $view, $separator, $valueQuote);
 			}
-			if(!\is_callable($v)){
+			if (!\is_callable($v)) {
 				return $v;
 			}
 		}, $input));
 	}
 
-	protected static function wrapValue($value,$js=NULL, $separator=' ', $valueQuote='"'){
+	protected static function wrapValue($value, $js=NULL, $separator=' ', $valueQuote='"') {
 		if (\is_array($value)) {
 			return self::wrap($value, $js, $separator, $valueQuote);
 		}
-		if ($value instanceof BaseHtml){
+		if ($value instanceof BaseHtml) {
 			return $value->compile($js);
 		}
-		if(!\is_callable($value)){
+		if (!\is_callable($value)) {
 			return $value;
 		}
 		return '';

Ajax/common/html/traits/BaseHtmlEventsTrait.php

Spacing +29 added lines, -29 removed lines

@@ -11,9 +11,9 @@ 
  * @property string identifier
  * @property BaseHtml _self
  */
-trait BaseHtmlEventsTrait{
+trait BaseHtmlEventsTrait {
 
-	protected $_events=array ();
+	protected $_events=array();
 
 	/**
 	 * @param string $event
@@ -23,21 +23,21 @@ 
 	 * @return BaseHtml
 	 */
 	public function addEvent($event, $jsCode, $stopPropagation=false, $preventDefault=false) {
-		if ($stopPropagation === true) {
-			$jsCode=Javascript::$stopPropagation . $jsCode;
+		if ($stopPropagation===true) {
+			$jsCode=Javascript::$stopPropagation.$jsCode;
 		}
-		if ($preventDefault === true) {
-			$jsCode=Javascript::$preventDefault . $jsCode;
+		if ($preventDefault===true) {
+			$jsCode=Javascript::$preventDefault.$jsCode;
 		}
 		return $this->_addEvent($event, $jsCode);
 	}
 	
-	public function trigger($event,$params="[]"){
+	public function trigger($event, $params="[]") {
 		$this->executeOnRun('$("#'.$this->identifier.'").trigger("'.$event.'",'.$params.');');
 	}
 	
-	public function jsTrigger($event,$params="[this]"){
-		return $this->jsDoJquery("trigger",["'".$event."'",$params]);
+	public function jsTrigger($event, $params="[this]") {
+		return $this->jsDoJquery("trigger", ["'".$event."'", $params]);
 	}
 
 	/**
@@ -48,11 +48,11 @@ 
 	public function _addEvent($event, $jsCode) {
 		if (array_key_exists($event, $this->_events)) {
 			if (\is_array($this->_events[$event])) {
-				if(array_search($jsCode, $this->_events[$event])===false){
+				if (array_search($jsCode, $this->_events[$event])===false) {
 					$this->_events[$event][]=$jsCode;
 				}
 			} else {
-				$this->_events[$event]=array ($this->_events[$event],$jsCode );
+				$this->_events[$event]=array($this->_events[$event], $jsCode);
 			}
 		} else {
 			$this->_events[$event]=$jsCode;
@@ -79,10 +79,10 @@ 
 		return $this->onClick($jsCode);
 	}
 
-	public function onCreate($jsCode){
-		if(isset($this->_events["_create"])){
+	public function onCreate($jsCode) {
+		if (isset($this->_events["_create"])) {
 			$this->_events["_create"][]=$jsCode;
-		}else{
+		} else {
 			$this->_events["_create"]=[$jsCode];
 		}
 		return $this;
@@ -91,15 +91,15 @@ 
 	public function addEventsOnRun(JsUtils $js=NULL) {
 		$this->_eventsOnCreate($js);
 		if (isset($this->_bsComponent)) {
-			foreach ( $this->_events as $event => $jsCode ) {
+			foreach ($this->_events as $event => $jsCode) {
 				$code=$jsCode;
 				if (\is_array($jsCode)) {
 					$code="";
-					foreach ( $jsCode as $jsC ) {
+					foreach ($jsCode as $jsC) {
 						if ($jsC instanceof AjaxCall) {
-							$code.="\n" . $jsC->compile($js);
+							$code.="\n".$jsC->compile($js);
 						} else {
-							$code.="\n" . $jsC;
+							$code.="\n".$jsC;
 						}
 					}
 				} elseif ($jsCode instanceof AjaxCall) {
@@ -107,20 +107,20 @@ 
 				}
 				$this->_bsComponent->addEvent($event, $code);
 			}
-			$this->_events=array ();
+			$this->_events=array();
 			return $this->_bsComponent->getScript();
 		}
 		return "";
 	}
 
-	protected function _eventsOnCreate(JsUtils $js=NULL){
-		if(isset($this->_events["_create"])){
+	protected function _eventsOnCreate(JsUtils $js=NULL) {
+		if (isset($this->_events["_create"])) {
 			$create=$this->_events["_create"];
-			if(\is_array($create)){
+			if (\is_array($create)) {
 				$create=\implode("", $create);
 			}
-			if(isset($js) && $create!=="")
-				$js->exec($create,true);
+			if (isset($js) && $create!=="")
+				$js->exec($create, true);
 			unset($this->_events["_create"]);
 		}
 	}
@@ -134,7 +134,7 @@ 
 	 * @return $this
 	 */
 	public function _ajaxOn($operation, $event, $url, $responseElement="", $parameters=array()) {
-		$params=array ("url" => $url,"responseElement" => $responseElement );
+		$params=array("url" => $url, "responseElement" => $responseElement);
 		$params=array_merge($params, $parameters);
 		$this->_addEvent($event, new AjaxCall($operation, $params));
 		return $this;
@@ -177,10 +177,10 @@ 
 	 **/
 	public function postOn($event, $url, $params="{}", $responseElement="", $parameters=array()) {
 		$allParameters=[];
-		if(isset($parameters["params"])){
+		if (isset($parameters["params"])) {
 			$allParameters[]=JsUtils::_correctParams($parameters["params"]);
 		}
-		if(isset($params)){
+		if (isset($params)) {
 			$allParameters[]=JsUtils::_correctParams($params);
 		}
 		$parameters["params"]=\implode("+'&'+", $allParameters);
@@ -227,7 +227,7 @@ 
 	}
 
 	public function jsDoJquery($jqueryCall, $param="") {
-		return "$('#" . $this->identifier . "')." . $jqueryCall . "(" . Javascript::prep_value($param) . ");";
+		return "$('#".$this->identifier."').".$jqueryCall."(".Javascript::prep_value($param).");";
 	}
 
 	public function executeOnRun($jsCode) {
@@ -247,7 +247,7 @@ 
 	}
 
 	public function jsToggle($value) {
-		return $this->jsDoJquery("toggle",$value);
+		return $this->jsDoJquery("toggle", $value);
 	}
 	/**
 	 * @return array

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

Spacing +4 added lines, -4 removed lines

@@ -21,7 +21,7 @@ 
 	 * @param string $event
 	 * @param boolean $multiple
 	 */
-	public function __construct($table,$class="active",$event="click",$multiple=false){
+	public function __construct($table, $class="active", $event="click", $multiple=false) {
 		$this->table=$table;
 		$this->class=$class;
 		$this->event=$event;
@@ -55,12 +55,12 @@ 
 		return $this;
 	}
 
-	public function run(){
+	public function run() {
 		$multiple="";
-		if(!$this->multiple){
+		if (!$this->multiple) {
 			$multiple="$(this).closest('tbody').children('tr').removeClass('".$this->class."');";
 		}
-		$this->table->onRow($this->event, $multiple."$(this).toggleClass('".$this->class."');".$this->table->jsTrigger("activeRowChange","[this]"),false,false);
+		$this->table->onRow($this->event, $multiple."$(this).toggleClass('".$this->class."');".$this->table->jsTrigger("activeRowChange", "[this]"), false, false);
 	}
 
 }

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

Spacing +11 added lines, -11 removed lines

@@ -6,32 +6,32 @@ 
 
 use Ajax\semantic\html\elements\HtmlIcon;
 
-class HtmlPaginationMenu extends HtmlMenu{
+class HtmlPaginationMenu extends HtmlMenu {
 	private $_page;
 	private $_pages;
 	private $_max;
-	public function __construct( $identifier, $items=array() ){
-		parent::__construct( $identifier,$items);
+	public function __construct($identifier, $items=array()) {
+		parent::__construct($identifier, $items);
 		$this->_pages=$items;
 	}
 	/**
 	 * {@inheritDoc}
 	 * @see \Ajax\common\html\BaseHtml::compile()
 	 */
-	public function compile(JsUtils $js=NULL,&$view=NULL){
+	public function compile(JsUtils $js=NULL, &$view=NULL) {
 		$max=$this->_max;
-		if(!$this->_compiled){
-			foreach ($this->content as $item){
+		if (!$this->_compiled) {
+			foreach ($this->content as $item) {
 				$item->addClass("pageNum");
 			}
-			$this->insertItem(new HtmlIcon("", "left chevron"))->setProperty("data-page", \max([1,$this->_page-1]))->addToProperty("class","_firstPage no-active");
-			$this->addItem(new HtmlIcon("", "right chevron"))->setProperty("data-page", \min([$max,$this->_page+1]))->setProperty("data-max", $max)->addToProperty("class","_lastPage no-active");
+			$this->insertItem(new HtmlIcon("", "left chevron"))->setProperty("data-page", \max([1, $this->_page-1]))->addToProperty("class", "_firstPage no-active");
+			$this->addItem(new HtmlIcon("", "right chevron"))->setProperty("data-page", \min([$max, $this->_page+1]))->setProperty("data-max", $max)->addToProperty("class", "_lastPage no-active");
 			$this->asPagination();
 		}
-		return parent::compile($js,$view);
+		return parent::compile($js, $view);
 	}
 
-	public function setActivePage($page){
+	public function setActivePage($page) {
 		$index=$page-$this->_pages[0];
 		$this->setActiveItem($index);
 		$this->_page=$page;
@@ -45,7 +45,7 @@ 
 	 * @param mixed $_max
 	 */
 	public function setMax($_max) {
-		$this->_max = $_max;
+		$this->_max=$_max;
 	}
 
 

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

Spacing +16 added lines, -16 removed lines

@@ -12,7 +12,7 @@ 
 use Ajax\JsUtils;
 
 class HtmlTD extends HtmlSemDoubleElement {
-	use TextAlignmentTrait,TableElementTrait;
+	use TextAlignmentTrait, TableElementTrait;
 	private $_container;
 	private $_row;
 	private $_col;
@@ -28,8 +28,8 @@ 
 	 */
 	public function __construct($identifier, $content=NULL, $tagName="td") {
 		parent::__construct($identifier, $tagName, "", $content);
-		$this->_variations=[ Variation::COLLAPSING ];
-		$this->_states=[ State::ACTIVE,State::POSITIVE,State::NEGATIVE,State::WARNING,State::ERROR,State::DISABLED ];
+		$this->_variations=[Variation::COLLAPSING];
+		$this->_states=[State::ACTIVE, State::POSITIVE, State::NEGATIVE, State::WARNING, State::ERROR, State::DISABLED];
 	}
 
 	public function setContainer($container, $row, $col) {
@@ -49,8 +49,8 @@ 
 	}
 
 	public function setRowspan($rowspan) {
-		$to=min($this->_container->count(), $this->_row + $rowspan - 1);
-		for($i=$to; $i > $this->_row; $i--) {
+		$to=min($this->_container->count(), $this->_row+$rowspan-1);
+		for ($i=$to; $i>$this->_row; $i--) {
 			$this->_container->toDelete($i, $this->_col);
 		}
 		$this->setProperty("rowspan", $rowspan);
@@ -58,7 +58,7 @@ 
 	}
 
 	public function mergeRow() {
-		if(!$this->_rowMerged){
+		if (!$this->_rowMerged) {
 			$this->_rowMerged=true;
 			return $this->setRowspan($this->_container->count());
 		}
@@ -66,7 +66,7 @@ 
 	}
 
 	public function mergeCol() {
-		if(!$this->_colMerged){
+		if (!$this->_colMerged) {
 			$this->_colMerged=true;
 			return $this->setColspan($this->_container->getRow($this->_row)->count());
 		}
@@ -74,9 +74,9 @@ 
 	}
 
 	public function setColspan($colspan) {
-		$to=min($this->_container->getRow($this->_row)->count(), $this->_col + $colspan - 1);
-		for($i=$to; $i > $this->_col; $i--) {
-			$this->_container->delete($this->_row, $this->_col + 1);
+		$to=min($this->_container->getRow($this->_row)->count(), $this->_col+$colspan-1);
+		for ($i=$to; $i>$this->_col; $i--) {
+			$this->_container->delete($this->_row, $this->_col+1);
 		}
 		$this->setProperty("colspan", $colspan);
 		return $this->_container;
@@ -115,21 +115,21 @@ 
 		return $this->addToProperty("class", "selectable");
 	}
 
-	public function setWidth($width){
+	public function setWidth($width) {
 		if (\is_int($width)) {
-			$width=Wide::getConstants()["W" . $width];
+			$width=Wide::getConstants()["W".$width];
 		}
 		$this->addToPropertyCtrl("class", $width, Wide::getConstants());
-		return $this->addToPropertyCtrl("class", "wide", array ("wide" ));
+		return $this->addToPropertyCtrl("class", "wide", array("wide"));
 	}
 
-	public function toDelete(){
+	public function toDelete() {
 		$this->_deleted=true;
 		return $this;
 	}
 
 	public function compile(JsUtils $js=NULL, &$view=NULL) {
-		if(!$this->_deleted)
-			return parent::compile($js,$view);
+		if (!$this->_deleted)
+			return parent::compile($js, $view);
 	}
 }

Ajax/semantic/html/elements/HtmlList.php

Spacing +42 added lines, -42 removed lines

@@ -25,17 +25,17 @@ 
 
 	protected function createItem($value) {
 		$count=$this->count();
-		$item=new HtmlListItem("item-" . $this->identifier . "-" . $count, $value);
+		$item=new HtmlListItem("item-".$this->identifier."-".$count, $value);
 		return $item;
 	}
 
 	public function addHeader($niveau, $content) {
-		$header=new HtmlHeader("header-" . $this->identifier, $niveau, $content, "page");
+		$header=new HtmlHeader("header-".$this->identifier, $niveau, $content, "page");
 		$this->wrap($header);
 		return $header;
 	}
 
-	public function getItemPart($index,$partName="header"){
+	public function getItemPart($index, $partName="header") {
 		return $this->getItem($index)->getPart($partName);
 	}
 
@@ -43,9 +43,9 @@ 
 		return $this->contentAs($tagName);
 	}
 
-	public function asLinks($hrefs=[],$target=NUll) {
-		$this->addToPropertyCtrl("class", "link", array ("link" ));
-		return parent::asLinks($hrefs,$target);
+	public function asLinks($hrefs=[], $target=NUll) {
+		$this->addToPropertyCtrl("class", "link", array("link"));
+		return parent::asLinks($hrefs, $target);
 	}
 
 	public function addList($items=array()) {
@@ -57,13 +57,13 @@ 
 	/**
 	 * @return HtmlListItem
 	 */
-	public function getItem($index){
+	public function getItem($index) {
 		return parent::getItem($index);
 	}
 
-	protected function getItemToAdd($item){
+	protected function getItemToAdd($item) {
 		$itemO=parent::getItemToAdd($item);
-		if($itemO instanceof AbstractCheckbox)
+		if ($itemO instanceof AbstractCheckbox)
 			$itemO->addClass("item");
 		return $itemO;
 	}
@@ -81,9 +81,9 @@ 
 	}
 
 	public function run(JsUtils $js) {
-		if ($this->_hasCheckedList === true) {
-			$jsCode=include dirname(__FILE__) . '/../../components/jsTemplates/tplCheckedList.php';
-			$jsCode=\str_replace("%identifier%", "#" . $this->identifier, $jsCode);
+		if ($this->_hasCheckedList===true) {
+			$jsCode=include dirname(__FILE__).'/../../components/jsTemplates/tplCheckedList.php';
+			$jsCode=\str_replace("%identifier%", "#".$this->identifier, $jsCode);
 			$jsCode=\str_replace("%fireOnInit%", $this->_fireOnInit, $jsCode);
 			$jsCode=\str_replace("%onChange%", $this->_ckItemChange, $jsCode);
 			$this->executeOnRun($jsCode);
@@ -94,9 +94,9 @@ 
 		return parent::run($js);
 	}
 	
-	protected function addFollowPoints(){
+	protected function addFollowPoints() {
 		$count=$this->count();
-		for ($i=$this->_maxVisible;$i<$count;$i++){
+		for ($i=$this->_maxVisible; $i<$count; $i++) {
 			$this->getItem($i)->addClass("notVisible")->setProperty("style", "display: none;");
 		}
 		$item=$this->addItem("...");
@@ -104,7 +104,7 @@ 
 		$item->onClick('$(this).hide();$("#'.$this->identifier.' .notVisible").show();');
 	}
 	
-	public function onCkItemChange($jsCode){
+	public function onCkItemChange($jsCode) {
 		$this->_ckItemChange=$jsCode;
 	}
 
@@ -112,7 +112,7 @@ 
 	 * @param boolean $fireOnInit
 	 */
 	public function setFireOnInit($fireOnInit) {
-		$this->_fireOnInit = $fireOnInit;
+		$this->_fireOnInit=$fireOnInit;
 	}
 
 	public function setRelaxed() {
@@ -135,18 +135,18 @@ 
 	 * {@inheritDoc}
 	 * @see \Ajax\common\html\HtmlCollection::compile()
 	 */
-	public function compile(JsUtils $js = NULL, &$view = NULL) {
-		if(isset($this->_maxVisible) && $this->_maxVisible<$this->count()){
+	public function compile(JsUtils $js=NULL, &$view=NULL) {
+		if (isset($this->_maxVisible) && $this->_maxVisible<$this->count()) {
 			$this->addFollowPoints();
-			if(isset($js)){
+			if (isset($js)) {
 				$visibility=new Visibility($js);
 				$visibility->attach("#".$this->identifier);
 				$visibility->setOnTopVisible("$(this).children('.notVisible').hide();$(this).find('.points').show();");
-				$visibility->compile($js,$view);
+				$visibility->compile($js, $view);
 				$this->_visibility=$visibility;
 			}
 		}
-		return parent::compile ($js,$view);
+		return parent::compile($js, $view);
 	}
 
 	/**
@@ -157,42 +157,42 @@ 
 	 * @param string $notAllChecked
 	 * @return HtmlList
 	 */
-	public function addCheckedList($items=array(), $masterItem=NULL, $values=array(),$notAllChecked=false,$name=null) {
+	public function addCheckedList($items=array(), $masterItem=NULL, $values=array(), $notAllChecked=false, $name=null) {
 		$count=$this->count();
-		$identifier=$this->identifier . "-" . $count;
+		$identifier=$this->identifier."-".$count;
 		if (isset($masterItem)) {
-			if(\is_array($masterItem)){
-				$masterO=new HtmlFormCheckbox("master-" . $identifier, @$masterItem[0],@$masterItem[1]);
-				if(isset($name))
+			if (\is_array($masterItem)) {
+				$masterO=new HtmlFormCheckbox("master-".$identifier, @$masterItem[0], @$masterItem[1]);
+				if (isset($name))
 					$masterO->setName($name);
-				if(isset($masterItem[1])){
-					if(\array_search($masterItem[1], $values)!==false){
+				if (isset($masterItem[1])) {
+					if (\array_search($masterItem[1], $values)!==false) {
 						$masterO->getDataField()->setProperty("checked", "");
 					}
 				}
-			}else{
-				$masterO=new HtmlFormCheckbox("master-" . $identifier, $masterItem);
+			} else {
+				$masterO=new HtmlFormCheckbox("master-".$identifier, $masterItem);
 			}
-			if($notAllChecked){
+			if ($notAllChecked) {
 				$masterO->getDataField()->addClass("_notAllChecked");
 			}
 			$masterO->getHtmlCk()->addToProperty("class", "master");
 			$masterO->setClass("item");
 			$this->addItem($masterO);
 		}
-		$fields=array ();
+		$fields=array();
 		$i=0;
-		foreach ( $items as $val => $caption ) {
-			$itemO=new HtmlFormCheckbox($identifier . "-" . $i++, $caption, $val, "child");
-			if (\array_search($val, $values) !== false) {
+		foreach ($items as $val => $caption) {
+			$itemO=new HtmlFormCheckbox($identifier."-".$i++, $caption, $val, "child");
+			if (\array_search($val, $values)!==false) {
 				$itemO->getDataField()->setProperty("checked", "");
 			}
-			if(isset($name))
+			if (isset($name))
 				$itemO->setName($name);
 			$itemO->setClass("item");
 			$fields[]=$itemO;
 		}
-		if (isset($masterO) === true) {
+		if (isset($masterO)===true) {
 			$list=new HtmlList("", $fields);
 			$list->setClass("list");
 			$masterO->addContent($list);
@@ -203,12 +203,12 @@ 
 		return $this;
 	}
 
-	public function setIcons($icons){
-		if(!\is_array($icons)){
+	public function setIcons($icons) {
+		if (!\is_array($icons)) {
 			$icons=\array_fill(0, \sizeof($this->content), $icons);
 		}
-		$max=\min(\sizeof($icons),\sizeof($this->content));
-		for($i=0;$i<$max;$i++){
+		$max=\min(\sizeof($icons), \sizeof($this->content));
+		for ($i=0; $i<$max; $i++) {
 			$this->content[$i]->addIcon($icons[$i]);
 		}
 		return $this;
@@ -224,7 +224,7 @@ 
 	 * @param mixed $_maxVisible
 	 */
 	public function setMaxVisible($_maxVisible) {
-		$this->_maxVisible = $_maxVisible;
+		$this->_maxVisible=$_maxVisible;
 		return $this;
 	}
 

Ajax/semantic/widgets/datatable/DataTableFieldAsTrait.php

Spacing +68 added lines, -68 removed lines

@@ -14,15 +14,15 @@ 
  * @property boolean $_visibleHover
  * @property InstanceViewer $_instanceViewer
  */
-trait DataTableFieldAsTrait{
-	protected $_buttons=["display","edit","delete"];
+trait DataTableFieldAsTrait {
+	protected $_buttons=["display", "edit", "delete"];
 	protected $_buttonsColumn;
-	abstract public function addField($field,$key=null);
-	abstract public function insertField($index,$field,$key=null);
-	abstract public function insertInField($index,$field,$key=null);
-	abstract public function fieldAs($index,$type,$attributes=NULL);
+	abstract public function addField($field, $key=null);
+	abstract public function insertField($index, $field, $key=null);
+	abstract public function insertInField($index, $field, $key=null);
+	abstract public function fieldAs($index, $type, $attributes=NULL);
 	abstract protected function cleanIdentifier($id);
-	abstract protected function _fieldAs($elementCallback,&$index,$attributes=NULL,$prefix=null);
+	abstract protected function _fieldAs($elementCallback, &$index, $attributes=NULL, $prefix=null);
 	
 	/**
 	 * @param string $caption
@@ -30,8 +30,8 @@ 
 	 * @param boolean $visibleHover
 	 * @return callable
 	 */
-	private function getFieldButtonCallable($caption,$visibleHover=true,$callback=null){
-		return $this->getCallable("getFieldButton",[$caption,$visibleHover],$callback);
+	private function getFieldButtonCallable($caption, $visibleHover=true, $callback=null) {
+		return $this->getCallable("getFieldButton", [$caption, $visibleHover], $callback);
 	}
 
 	/**
@@ -40,20 +40,20 @@ 
 	 * @param callable $callback
 	 * @return callable
 	 */
-	private function getCallable($thisCallback,$parameters,$callback=null){
-		$result=function($instance) use($thisCallback,$parameters,$callback){
-			$object=call_user_func_array(array($this,$thisCallback), $parameters);
-			if(isset($callback)){
-				if(\is_callable($callback)){
-					$callback($object,$instance,$this->_instanceViewer->count()+1);
+	private function getCallable($thisCallback, $parameters, $callback=null) {
+		$result=function($instance) use($thisCallback, $parameters, $callback){
+			$object=call_user_func_array(array($this, $thisCallback), $parameters);
+			if (isset($callback)) {
+				if (\is_callable($callback)) {
+					$callback($object, $instance, $this->_instanceViewer->count()+1);
 				}
 			}
-			if($object instanceof HtmlSemDoubleElement){
+			if ($object instanceof HtmlSemDoubleElement) {
 				$id=$this->_instanceViewer->getIdentifier();
-				$object->setProperty("data-ajax",$id);
-				if($object->propertyContains("class","visibleover")){
+				$object->setProperty("data-ajax", $id);
+				if ($object->propertyContains("class", "visibleover")) {
 					$this->_visibleHover=true;
-					$object->setProperty("style","visibility:hidden;");
+					$object->setProperty("style", "visibility:hidden;");
 				}
 			}
 			return $object;
@@ -65,16 +65,16 @@ 
 	 * @param string $caption
 	 * @return HtmlButton
 	 */
-	private function getFieldButton($caption,$visibleHover=true){
-		$bt= new HtmlButton($this->cleanIdentifier($caption),$caption);
-		if($visibleHover)
+	private function getFieldButton($caption, $visibleHover=true) {
+		$bt=new HtmlButton($this->cleanIdentifier($caption), $caption);
+		if ($visibleHover)
 			$this->_visibleOver($bt);
 		return $bt;
 	}
 
-	private function getFieldButtons($buttons,$visibleHover=true){
-		$bts=new HtmlButtonGroups("",$buttons);
-		if($visibleHover)
+	private function getFieldButtons($buttons, $visibleHover=true) {
+		$bts=new HtmlButtonGroups("", $buttons);
+		if ($visibleHover)
 			$this->_visibleOver($bts);
 		return $bts;
 	}
@@ -88,19 +88,19 @@ 
 	 * @param array $attributes associative array (<b>ajax</b> key is for ajax post)
 	 * @return DataTable
 	 */
-	public function fieldAsSubmit($index,$cssStyle=NULL,$url=NULL,$responseElement=NULL,$attributes=NULL){
-		return $this->_fieldAs(function($id,$name,$value,$caption) use ($url,$responseElement,$cssStyle,$attributes){
-			$button=new HtmlButton($id,$value,$cssStyle);
-			$button->postOnClick($url,"$(event.target).closest('tr').find(':input').serialize()",$responseElement,$attributes["ajax"]);
-			if(!isset($attributes["visibleHover"]) || $attributes["visibleHover"])
+	public function fieldAsSubmit($index, $cssStyle=NULL, $url=NULL, $responseElement=NULL, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) use ($url, $responseElement, $cssStyle, $attributes){
+			$button=new HtmlButton($id, $value, $cssStyle);
+			$button->postOnClick($url, "$(event.target).closest('tr').find(':input').serialize()", $responseElement, $attributes["ajax"]);
+			if (!isset($attributes["visibleHover"]) || $attributes["visibleHover"])
 				$this->_visibleOver($button);
 				return $button;
-		}, $index,$attributes);
+		}, $index, $attributes);
 	}
 
-	protected function _visibleOver(BaseHtml $element){
+	protected function _visibleOver(BaseHtml $element) {
 		$this->_visibleHover=true;
-		return $element->addToProperty("class", "visibleover")->setProperty("style","visibility:hidden;");
+		return $element->addToProperty("class", "visibleover")->setProperty("style", "visibility:hidden;");
 	}
 
 	/**
@@ -110,8 +110,8 @@ 
 	 * @param boolean $visibleHover
 	 * @return DataTable
 	 */
-	public function addFieldButton($caption,$visibleHover=true,$callback=null){
-		$this->addField($this->getCallable("getFieldButton",[$caption,$visibleHover],$callback));
+	public function addFieldButton($caption, $visibleHover=true, $callback=null) {
+		$this->addField($this->getCallable("getFieldButton", [$caption, $visibleHover], $callback));
 		return $this;
 	}
 
@@ -122,8 +122,8 @@ 
 	 * @param boolean $visibleHover
 	 * @return DataTable
 	 */
-	public function addFieldButtons($buttons,$visibleHover=true,$callback=null){
-		$this->addField($this->getCallable("getFieldButtons",[$buttons,$visibleHover],$callback));
+	public function addFieldButtons($buttons, $visibleHover=true, $callback=null) {
+		$this->addField($this->getCallable("getFieldButtons", [$buttons, $visibleHover], $callback));
 		return $this;
 	}
 
@@ -134,8 +134,8 @@ 
 	 * @param callable $callback
 	 * @return DataTable
 	 */
-	public function insertFieldButton($index,$caption,$visibleHover=true,$callback=null){
-		$this->insertField($index, $this->getFieldButtonCallable($caption,$visibleHover,$callback));
+	public function insertFieldButton($index, $caption, $visibleHover=true, $callback=null) {
+		$this->insertField($index, $this->getFieldButtonCallable($caption, $visibleHover, $callback));
 		return $this;
 	}
 
@@ -146,25 +146,25 @@ 
 	 * @param callable $callback
 	 * @return DataTable
 	 */
-	public function insertInFieldButton($index,$caption,$visibleHover=true,$callback=null,$key=null){
-		$this->insertInField($index, $this->getFieldButtonCallable($caption,$visibleHover,$callback),$key);
+	public function insertInFieldButton($index, $caption, $visibleHover=true, $callback=null, $key=null) {
+		$this->insertInField($index, $this->getFieldButtonCallable($caption, $visibleHover, $callback), $key);
 		return $this;
 	}
 
-	private function addDefaultButton($icon,$class=null,$visibleHover=true,$callback=null,$key=null){
-		$this->addField($this->getCallable("getDefaultButton",[$icon,$class,$visibleHover],$callback),$key);
+	private function addDefaultButton($icon, $class=null, $visibleHover=true, $callback=null, $key=null) {
+		$this->addField($this->getCallable("getDefaultButton", [$icon, $class, $visibleHover], $callback), $key);
 		return $this;
 	}
 
-	public function insertDefaultButtonIn($index,$icon,$class=null,$visibleHover=true,$callback=null,$key=null){
-		$this->insertInField($index,$this->getCallable("getDefaultButton",[$icon,$class,$visibleHover],$callback),$key);
+	public function insertDefaultButtonIn($index, $icon, $class=null, $visibleHover=true, $callback=null, $key=null) {
+		$this->insertInField($index, $this->getCallable("getDefaultButton", [$icon, $class, $visibleHover], $callback), $key);
 		return $this;
 	}
 
-	private function getDefaultButton($icon,$class=null,$visibleHover=true){
-		$bt=$this->getFieldButton("",$visibleHover);
+	private function getDefaultButton($icon, $class=null, $visibleHover=true) {
+		$bt=$this->getFieldButton("", $visibleHover);
 		$bt->asIcon($icon);
-		if(isset($class))
+		if (isset($class))
 			$bt->addClass($class);
 		return $bt;
 	}
@@ -176,9 +176,9 @@ 
 	 * @param callable $callback this function takes the following arguments : $object=>the delete button, $instance : the active instance of the object
 	 * @return DataTable
 	 */
-	public function addDeleteButton($visibleHover=true,$deleteBehavior=[],$callback=null){
+	public function addDeleteButton($visibleHover=true, $deleteBehavior=[], $callback=null) {
 		$this->_deleteBehavior=$deleteBehavior;
-		return $this->addDefaultButton("remove","_delete red basic",$visibleHover,$callback,"delete");
+		return $this->addDefaultButton("remove", "_delete red basic", $visibleHover, $callback, "delete");
 	}
 
 	/**
@@ -188,9 +188,9 @@ 
 	 * @param callable $callback this function takes the following arguments : $object=>the delete button, $instance : the active instance of the object
 	 * @return DataTable
 	 */
-	public function addEditButton($visibleHover=true,$editBehavior=[],$callback=null){
+	public function addEditButton($visibleHover=true, $editBehavior=[], $callback=null) {
 		$this->_editBehavior=$editBehavior;
-		return $this->addDefaultButton("edit","_edit basic",$visibleHover,$callback,"edit");
+		return $this->addDefaultButton("edit", "_edit basic", $visibleHover, $callback, "edit");
 	}
 	
 	/**
@@ -200,9 +200,9 @@ 
 	 * @param callable $callback this function takes the following arguments : $object=>the delete button, $instance : the active instance of the object
 	 * @return DataTable
 	 */
-	public function addDisplayButton($visibleHover=true,$displayBehavior=[],$callback=null){
+	public function addDisplayButton($visibleHover=true, $displayBehavior=[], $callback=null) {
 		$this->_displayBehavior=$displayBehavior;
-		return $this->addDefaultButton("eye","_display basic",$visibleHover,$callback,"display");
+		return $this->addDefaultButton("eye", "_display basic", $visibleHover, $callback, "display");
 	}
 
 	/**
@@ -213,10 +213,10 @@ 
 	 * @param callable $callbackDelete this function takes the following arguments : $object=>the delete button, $instance : the active instance of the object
 	 * @return DataTable
 	 */
-	public function addEditDeleteButtons($visibleHover=true,$behavior=[],$callbackEdit=null,$callbackDelete=null){
-		$this->addEditButton($visibleHover,$behavior,$callbackEdit);
+	public function addEditDeleteButtons($visibleHover=true, $behavior=[], $callbackEdit=null, $callbackDelete=null) {
+		$this->addEditButton($visibleHover, $behavior, $callbackEdit);
 		$index=$this->_instanceViewer->visiblePropertiesCount()-1;
-		$this->insertDeleteButtonIn($index,$visibleHover,$behavior,$callbackDelete);
+		$this->insertDeleteButtonIn($index, $visibleHover, $behavior, $callbackDelete);
 		return $this;
 	}
 	
@@ -229,35 +229,35 @@ 
 	 * @param callable $callbackDelete this function takes the following arguments : $object=>the delete button, $instance : the active instance of the object
 	 * @return DataTable
 	 */
-	public function addAllButtons($visibleHover=true,$behavior=[],$callbackDisplay=null,$callbackEdit=null,$callbackDelete=null){
-		$this->addDisplayButton($visibleHover,$behavior,$callbackDisplay);
+	public function addAllButtons($visibleHover=true, $behavior=[], $callbackDisplay=null, $callbackEdit=null, $callbackDelete=null) {
+		$this->addDisplayButton($visibleHover, $behavior, $callbackDisplay);
 		$index=$this->_instanceViewer->visiblePropertiesCount()-1;
 		$this->_buttonsColumn=$index;
-		$this->insertEditButtonIn($index,$visibleHover,$behavior,$callbackEdit);
-		$this->insertDeleteButtonIn($index,$visibleHover,$behavior,$callbackDelete);
+		$this->insertEditButtonIn($index, $visibleHover, $behavior, $callbackEdit);
+		$this->insertDeleteButtonIn($index, $visibleHover, $behavior, $callbackDelete);
 		return $this;
 	}
 
-	public function insertDeleteButtonIn($index,$visibleHover=true,$deleteBehavior=[],$callback=null){
+	public function insertDeleteButtonIn($index, $visibleHover=true, $deleteBehavior=[], $callback=null) {
 		$this->_deleteBehavior=$deleteBehavior;
-		return $this->insertDefaultButtonIn($index,"remove","_delete red basic",$visibleHover,$callback,"delete");
+		return $this->insertDefaultButtonIn($index, "remove", "_delete red basic", $visibleHover, $callback, "delete");
 	}
 
-	public function insertEditButtonIn($index,$visibleHover=true,$editBehavior=[],$callback=null){
+	public function insertEditButtonIn($index, $visibleHover=true, $editBehavior=[], $callback=null) {
 		$this->_editBehavior=$editBehavior;
-		return $this->insertDefaultButtonIn($index,"edit","_edit basic",$visibleHover,$callback,"edit");
+		return $this->insertDefaultButtonIn($index, "edit", "_edit basic", $visibleHover, $callback, "edit");
 	}
 	
-	public function insertDisplayButtonIn($index,$visibleHover=true,$displayBehavior=[],$callback=null){
+	public function insertDisplayButtonIn($index, $visibleHover=true, $displayBehavior=[], $callback=null) {
 		$this->_displayBehavior=$displayBehavior;
-		return $this->insertDefaultButtonIn($index,"eye","_display basic",$visibleHover,$callback,"display");
+		return $this->insertDefaultButtonIn($index, "eye", "_display basic", $visibleHover, $callback, "display");
 	}
 	
 	/**
 	 * @param array  $_buttons
 	 */
 	public function setButtons($_buttons) {
-		$this->_buttons = $_buttons;
+		$this->_buttons=$_buttons;
 		return $this;
 	}
 }

Ajax/common/html/HtmlCollection.php

Spacing +55 added lines, -55 removed lines

@@ -14,44 +14,44 @@ 
  */
 abstract class HtmlCollection extends HtmlDoubleElement {
 
-	public function __construct($identifier,$tagName="div"){
-		parent::__construct($identifier,$tagName);
+	public function __construct($identifier, $tagName="div") {
+		parent::__construct($identifier, $tagName);
 		$this->content=array();
 	}
 
-	public function addItems($items){
-		if(JArray::isAssociative($items)){
-			foreach ($items as $k=>$v){
-				$this->addItem([$k,$v]);
+	public function addItems($items) {
+		if (JArray::isAssociative($items)) {
+			foreach ($items as $k=>$v) {
+				$this->addItem([$k, $v]);
 			}
-		}else{
-			foreach ($items as $item){
+		} else {
+			foreach ($items as $item) {
 				$this->addItem($item);
 			}
 		}
 		return $this;
 	}
 
-	public function setItems($items){
+	public function setItems($items) {
 		$this->content=$items;
 		return $this;
 	}
 
-	public function getItems(){
+	public function getItems() {
 		return $this->content;
 	}
 
-	protected function getItemToAdd($item){
+	protected function getItemToAdd($item) {
 		$itemO=$item;
-		if($this->createCondition($item)===true){
+		if ($this->createCondition($item)===true) {
 			$itemO=$this->createItem($item);
 		}
 		return $itemO;
 	}
 
-	protected function setItemIdentifier($item,$classname,$index){
-		if($item instanceof BaseWidget){
-			if(JString::isNull($item->getIdentifier())){
+	protected function setItemIdentifier($item, $classname, $index) {
+		if ($item instanceof BaseWidget) {
+			if (JString::isNull($item->getIdentifier())) {
 				$item->setIdentifier($classname."-".$this->identifier."-".$index);
 			}
 		}
@@ -62,15 +62,15 @@ 
 	 * @param HtmlDoubleElement|string|array $item
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
-	public function addItem($item){
+	public function addItem($item) {
 		$itemO=$this->getItemToAdd($item);
 		$this->addContent($itemO);
 		return $itemO;
 	}
 
-	public function insertItem($item,$position=0){
+	public function insertItem($item, $position=0) {
 		$itemO=$this->getItemToAdd($item);
-		\array_splice( $this->content, $position, 0, array($itemO));
+		\array_splice($this->content, $position, 0, array($itemO));
 		return $itemO;
 	}
 
@@ -80,7 +80,7 @@ 
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
 	public function getItem($index) {
-		if (is_int($index)&& isset($this->content[$index]))
+		if (is_int($index) && isset($this->content[$index]))
 			return $this->content[$index];
 		else {
 			$elm=$this->getElementById($index, $this->content);
@@ -93,11 +93,11 @@ 
 		return $this;
 	}
 
-	public function removeItem($index){
+	public function removeItem($index) {
 		return array_splice($this->content, $index, 1);
 	}
 
-	public function count(){
+	public function count() {
 		return \sizeof($this->content);
 	}
 
@@ -108,8 +108,8 @@ 
 		return $this->addItem($function($object));
 	}
 
-	public function apply($callBack){
-		foreach ($this->content as $item){
+	public function apply($callBack) {
+		foreach ($this->content as $item) {
 			$callBack($item);
 		}
 		return $this;
@@ -129,23 +129,23 @@ 
 	 */
 	abstract protected function createItem($value);
 
-	protected function createCondition($value){
+	protected function createCondition($value) {
 		return \is_object($value)===false;
 	}
 
-	protected function contentAs($tagName){
-		foreach ($this->content as $item){
+	protected function contentAs($tagName) {
+		foreach ($this->content as $item) {
 			$item->setTagName($tagName);
 		}
 		return $this;
 	}
 
-	public function setProperties($properties){
+	public function setProperties($properties) {
 		$i=0;
-		foreach ($properties as $k=>$v){
+		foreach ($properties as $k=>$v) {
 			$c=$this->content[$i++];
-			if(isset($c))
-				$c->setProperty($k,$v);
+			if (isset($c))
+				$c->setProperty($k, $v);
 			else
 				return $this;
 		}
@@ -158,15 +158,15 @@ 
 	 * @param array|mixed $values
 	 * @return $this
 	 */
-	public function setPropertyValues($property,$values){
-		if(\is_array($values)===false){
-			$values=\array_fill(0, $this->count(),$values);
+	public function setPropertyValues($property, $values) {
+		if (\is_array($values)===false) {
+			$values=\array_fill(0, $this->count(), $values);
 		}
-		foreach ($values as $i=>$value){
-			if(isset($this->content[$i])){
-				$this->content[$i]->setProperty($property,$value);
+		foreach ($values as $i=>$value) {
+			if (isset($this->content[$i])) {
+				$this->content[$i]->setProperty($property, $value);
 			}
-			else{
+			else {
 				return $this;
 			}
 		}
@@ -179,15 +179,15 @@ 
 	 * @param array|mixed $values
 	 * @return $this
 	 */
-	public function addPropertyValues($property,$values){
-		if(\is_array($values)===false){
-			$values=\array_fill(0, $this->count(),$values);
+	public function addPropertyValues($property, $values) {
+		if (\is_array($values)===false) {
+			$values=\array_fill(0, $this->count(), $values);
 		}
-		foreach ($values as $i=>$value){
-			if(isset($this->content[$i])){
-				$this->content[$i++]->addToProperty($property,$value);
+		foreach ($values as $i=>$value) {
+			if (isset($this->content[$i])) {
+				$this->content[$i++]->addToProperty($property, $value);
 			}
-			else{
+			else {
 				return $this;
 			}
 		}
@@ -197,13 +197,13 @@ 
 	public function compile(JsUtils $js=NULL, &$view=NULL) {
 		$index=0;
 		$classname=\strtolower(JReflection::shortClassName($this));
-		foreach ($this->content as $item){
-			$this->setItemIdentifier($item,$classname,$index++);
+		foreach ($this->content as $item) {
+			$this->setItemIdentifier($item, $classname, $index++);
 		}
-		return parent::compile($js,$view);
+		return parent::compile($js, $view);
 	}
 
-	public function getItemById($identifier){
+	public function getItemById($identifier) {
 		return $this->getElementById($identifier, $this->content);
 	}
 
@@ -212,13 +212,13 @@ 
 	 * @param string $target
 	 * @return HtmlCollection
 	 */
-	public function asLinks($hrefs=[],$target=NUll) {
-		foreach ( $this->content as $index=>$item ) {
-			if($item instanceof HtmlDoubleElement){
+	public function asLinks($hrefs=[], $target=NUll) {
+		foreach ($this->content as $index=>$item) {
+			if ($item instanceof HtmlDoubleElement) {
 				$href="";
-				if(isset($hrefs[$index]))
+				if (isset($hrefs[$index]))
 					$href=$hrefs[$index];
-				$item->asLink($href,$target);
+				$item->asLink($href, $target);
 			}
 		}
 		return $this;
@@ -230,8 +230,8 @@ 
 	 * @param int $length  If length is omitted, removes everything from offset to the end of the array. If length is specified and is positive, then that many elements will be removed. If length is specified and is negative then the end of the removed portion will be that many elements from the end of the array. If length is specified and is zero, no elements will be removed. Tip: to remove everything from offset to the end of the array when replacement is also specified, use count($input) for length. 
 	 * @return $this
 	 */
-	public function splice($offset,$length=null){
-		$this->content=array_slice($this->content, $offset,$length);
+	public function splice($offset, $length=null) {
+		$this->content=array_slice($this->content, $offset, $length);
 		return $this;
 	}
 }

Ajax/common/html/traits/BaseHtmlPropertiesTrait.php

Spacing +12 added lines, -12 removed lines

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