phpMv / phpMv-UI

Ajax/service/AjaxCall.php

Spacing +5 added lines, -5 removed lines

@@ -23,21 +23,21 @@ 
 		$this->parameters["immediatly"]=false;
 		extract($this->parameters);
 		$result=$this->_eventPreparing($preventDefault, $stopPropagation);
-		switch($this->method) {
+		switch ($this->method) {
 			case "get":
 				$result.=$js->getDeferred($url, $responseElement, $this->parameters);
 				break;
 			case "post":
-				$result.=$js->postDeferred($url, $params,$responseElement, $this->parameters);
+				$result.=$js->postDeferred($url, $params, $responseElement, $this->parameters);
 				break;
 			case "postForm":
 				$result.=$js->postFormDeferred($url, $form, $responseElement, $this->parameters);
 				break;
 			case "json":
-				$result.=$js->jsonDeferred($url,$method,$this->parameters);
+				$result.=$js->jsonDeferred($url, $method, $this->parameters);
 				break;
 			case "jsonArray":
-				$result.=$js->jsonArrayDeferred($modelSelector, $url,$method,$this->parameters);
+				$result.=$js->jsonArrayDeferred($modelSelector, $url, $method, $this->parameters);
 				break;
 			default:
 				break;
@@ -45,7 +45,7 @@ 
 		return $result;
 	}
 
-	protected function _eventPreparing($preventDefault,$stopPropagation){
+	protected function _eventPreparing($preventDefault, $stopPropagation) {
 		$result="";
 		if ($preventDefault===true) {
 			$result.=Javascript::$preventDefault;

Ajax/common/html/html5/HtmlUtils.php

Spacing +2 added lines, -2 removed lines

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

Ajax/common/html/traits/BaseHtmlPropertiesTrait.php

Spacing +12 added lines, -12 removed lines

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

Ajax/bootstrap/html/HtmlNavbar.php

Spacing +7 added lines, -7 removed lines

@@ -32,7 +32,7 @@ 
 	public function __construct($identifier, $brand="Brand", $brandHref="#") {
 		parent::__construct($identifier);
 		$this->_template=include 'templates/tplNavbar.php';
-		$this->navZones=array ();
+		$this->navZones=array();
 		$this->class="navbar-default";
 		$this->brand=$brand;
 		$this->brandHref=$brandHref;
@@ -60,7 +60,7 @@ 
 	}
 
 	public function setBrandImage($imageSrc) {
-		$this->brandImage=new HtmlImg("brand-img-".$this->_identifier,$imageSrc,$this->brand);
+		$this->brandImage=new HtmlImg("brand-img-".$this->_identifier, $imageSrc, $this->brand);
 		$this->brand="";
 		return $this;
 	}
@@ -104,7 +104,7 @@ 
 
 	public function setNavZones($navZones) {
 		if (\is_array($navZones)) {
-			foreach ( $navZones as $zoneType => $zoneArray ) {
+			foreach ($navZones as $zoneType => $zoneArray) {
 				if (is_string($zoneType)) {
 					$zone=$this->addZone($zoneType);
 					$zone->fromArray($zoneArray);
@@ -144,7 +144,7 @@ 
 			if ($index<$nb)
 				$zone=$this->navZones [$index];
 		} else {
-			for($i=0; $i<$nb; $i++) {
+			for ($i=0; $i<$nb; $i++) {
 				if ($this->navZones [$i]->getIdentifier()===$index) {
 					$zone=$this->navZones [$i];
 					break;
@@ -155,7 +155,7 @@ 
 	}
 
 	public function run(JsUtils $js) {
-		foreach ( $this->navZones as $zone ) {
+		foreach ($this->navZones as $zone) {
 			$zone->run($js);
 		}
 		if ($this->hasScrollspy) {
@@ -177,9 +177,9 @@ 
 	}
 
 	public function setFluid($fluid) {
-		if($fluid===true){
+		if ($fluid===true) {
 			$this->fluid="container-fluid";
-		}else{
+		} else {
 			$this->fluid="container";
 		}
 		return $this;

Ajax/common/traits/JsUtilsActionsTrait.php

Spacing +38 added lines, -38 removed lines

@@ -11,7 +11,7 @@ 
  */
 trait JsUtilsActionsTrait {
 
-	abstract public function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false,$immediatly=true);
+	abstract public function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false, $immediatly=true);
 	/**
 	 * show or hide with effect
 	 *
@@ -22,7 +22,7 @@ 
 	 * @param boolean $immediatly defers the execution if set to false
 	 * @return string
 	 */
-	protected function _showHideWithEffect($action,$element='this', $speed='', $callback='', $immediatly=false) {
+	protected function _showHideWithEffect($action, $element='this', $speed='', $callback='', $immediatly=false) {
 		$element=Javascript::prep_element($element);
 		$speed=$this->_validate_speed($speed);
 		if ($callback!='') {
@@ -39,8 +39,8 @@ 
 	 * @return string
 	 */
 	private function _validate_speed($speed) {
-		if (in_array($speed, array (
-				'slow','normal','fast'
+		if (in_array($speed, array(
+				'slow', 'normal', 'fast'
 		))) {
 			$speed='"'.$speed.'"';
 		} elseif (preg_match("/[^0-9]/", $speed)) {
@@ -57,7 +57,7 @@ 
 	 * @param string $param
 	 * @param boolean $immediatly delayed if false
 	 */
-	public function _genericCallValue($jQueryCall,$element='this', $param="", $immediatly=false) {
+	public function _genericCallValue($jQueryCall, $element='this', $param="", $immediatly=false) {
 		$element=Javascript::prep_element($element);
 		if (isset($param)) {
 			$param=Javascript::prep_value($param);
@@ -77,7 +77,7 @@ 
 	 * @param boolean $immediatly delayed if false
 	 * @return string
 	 */
-	public function _genericCallElement($jQueryCall,$to='this', $element, $immediatly=false) {
+	public function _genericCallElement($jQueryCall, $to='this', $element, $immediatly=false) {
 		$to=Javascript::prep_element($to);
 		$element=Javascript::prep_element($element);
 		$str="$({$to}).{$jQueryCall}({$element});";
@@ -94,7 +94,7 @@ 
 	 * @return string
 	 */
 	public function addClass($element='this', $class='', $immediatly=false) {
-		return $this->_genericCallValue('addClass',$element, $class, $immediatly);
+		return $this->_genericCallValue('addClass', $element, $class, $immediatly);
 	}
 
 	/**
@@ -104,8 +104,8 @@ 
 	 * @param boolean $immediatly defers the execution if set to false
 	 * @return string
 	 */
-	public function after($to, $element, $immediatly=false){
-		return $this->_genericCallElement('after',$to, $element, $immediatly);
+	public function after($to, $element, $immediatly=false) {
+		return $this->_genericCallElement('after', $to, $element, $immediatly);
 	}
 
 	/**
@@ -115,8 +115,8 @@ 
 	 * @param boolean $immediatly defers the execution if set to false
 	 * @return string
 	 */
-	public function before($to, $element, $immediatly=false){
-		return $this->_genericCallElement('before',$to, $element, $immediatly);
+	public function before($to, $element, $immediatly=false) {
+		return $this->_genericCallElement('before', $to, $element, $immediatly);
 	}
 
 	/**
@@ -144,8 +144,8 @@ 
 	 * @param string $value
 	 * @param boolean $immediatly defers the execution if set to false
 	 */
-	public function val($element='this',$value='',$immediatly=false){
-		return $this->_genericCallValue('val',$element,$value,$immediatly);
+	public function val($element='this', $value='', $immediatly=false) {
+		return $this->_genericCallValue('val', $element, $value, $immediatly);
 	}
 
 	/**
@@ -155,7 +155,7 @@ 
 	 * @param boolean $immediatly defers the execution if set to false
 	 */
 	public function html($element='this', $value='', $immediatly=false) {
-		return $this->_genericCallValue('html',$element, $value, $immediatly);
+		return $this->_genericCallValue('html', $element, $value, $immediatly);
 	}
 
 	/**
@@ -174,7 +174,7 @@ 
 
 		$animations="\t\t\t";
 		if (\is_array($params)) {
-			foreach ( $params as $param => $value ) {
+			foreach ($params as $param => $value) {
 				$animations.=$param.': \''.$value.'\', ';
 			}
 		}
@@ -203,7 +203,7 @@ 
 	 * @return string
 	 */
 	public function append($to, $element, $immediatly=false) {
-		return $this->_genericCallElement('append',$to, $element, $immediatly);
+		return $this->_genericCallElement('append', $to, $element, $immediatly);
 	}
 
 	/**
@@ -214,7 +214,7 @@ 
 	 * @return string
 	 */
 	public function prepend($to, $element, $immediatly=false) {
-		return $this->_genericCallElement('prepend',$to, $element, $immediatly);
+		return $this->_genericCallElement('prepend', $to, $element, $immediatly);
 	}
 
 	/**
@@ -227,7 +227,7 @@ 
 	 * @return string
 	 */
 	public function fadeIn($element='this', $speed='', $callback='', $immediatly=false) {
-		return $this->_showHideWithEffect("fadeIn",$element,$speed,$callback,$immediatly);
+		return $this->_showHideWithEffect("fadeIn", $element, $speed, $callback, $immediatly);
 	}
 
 	/**
@@ -240,7 +240,7 @@ 
 	 * @return string
 	 */
 	public function fadeOut($element='this', $speed='', $callback='', $immediatly=false) {
-		return $this->_showHideWithEffect("fadeOut",$element,$speed,$callback,$immediatly);
+		return $this->_showHideWithEffect("fadeOut", $element, $speed, $callback, $immediatly);
 	}
 
 	/**
@@ -253,7 +253,7 @@ 
 	 * @return string
 	 */
 	public function slideUp($element='this', $speed='', $callback='', $immediatly=false) {
-		return $this->_showHideWithEffect("slideUp",$element,$speed,$callback,$immediatly);
+		return $this->_showHideWithEffect("slideUp", $element, $speed, $callback, $immediatly);
 	}
 
 	/**
@@ -265,7 +265,7 @@ 
 	 * @return string
 	 */
 	public function removeClass($element='this', $class='', $immediatly=false) {
-		return $this->_genericCallValue('removeClass',$element, $class, $immediatly);
+		return $this->_genericCallValue('removeClass', $element, $class, $immediatly);
 	}
 
 	/**
@@ -278,7 +278,7 @@ 
 	 * @return string
 	 */
 	public function slideDown($element='this', $speed='', $callback='', $immediatly=false) {
-		return $this->_showHideWithEffect("slideDown",$element,$speed,$callback,$immediatly);
+		return $this->_showHideWithEffect("slideDown", $element, $speed, $callback, $immediatly);
 	}
 
 	/**
@@ -291,7 +291,7 @@ 
 	 * @return string
 	 */
 	public function slideToggle($element='this', $speed='', $callback='', $immediatly=false) {
-		return $this->_showHideWithEffect("slideToggle",$element,$speed,$callback,$immediatly);
+		return $this->_showHideWithEffect("slideToggle", $element, $speed, $callback, $immediatly);
 	}
 
 	/**
@@ -304,7 +304,7 @@ 
 	 * @return string
 	 */
 	public function hide($element='this', $speed='', $callback='', $immediatly=false) {
-		return $this->_showHideWithEffect("hide",$element,$speed,$callback,$immediatly);
+		return $this->_showHideWithEffect("hide", $element, $speed, $callback, $immediatly);
 	}
 
 	/**
@@ -317,7 +317,7 @@ 
 	 * @return string
 	 */
 	public function toggle($element='this', $speed='', $callback='', $immediatly=false) {
-		return $this->_showHideWithEffect("toggle",$element,$speed,$callback,$immediatly);
+		return $this->_showHideWithEffect("toggle", $element, $speed, $callback, $immediatly);
 	}
 
 	/**
@@ -329,7 +329,7 @@ 
 	 * @return string
 	 */
 	public function toggleClass($element='this', $class='', $immediatly=false) {
-		return $this->_genericCallValue('toggleClass',$element, $class, $immediatly);
+		return $this->_genericCallValue('toggleClass', $element, $class, $immediatly);
 	}
 
 	/**
@@ -357,7 +357,7 @@ 
 	 * @return string
 	 */
 	public function show($element='this', $speed='', $callback='', $immediatly=false) {
-		return $this->_showHideWithEffect("show",$element,$speed,$callback,$immediatly);
+		return $this->_showHideWithEffect("show", $element, $speed, $callback, $immediatly);
 	}
 
 	/**
@@ -369,8 +369,8 @@ 
 	 */
 	public function sortable($element, $options=array()) {
 		if (count($options)>0) {
-			$sort_options=array ();
-			foreach ( $options as $k => $v ) {
+			$sort_options=array();
+			foreach ($options as $k => $v) {
 				$sort_options[]="\n\t\t".$k.': '.$v."";
 			}
 			$sort_options=implode(",", $sort_options);
@@ -467,8 +467,8 @@ 
 	 * @param boolean $immediatly
 	 * @return string
 	 */
-	private function _doJQueryOn($event, $element, $elementToModify, $jqueryCall, $param="", $preventDefault=false, $stopPropagation=false, $jsCallback="",$immediatly=true) {
-		return $this->_add_event($element, $this->_doJQuery($elementToModify, $jqueryCall, $param, $jsCallback), $event, $preventDefault, $stopPropagation,$immediatly);
+	private function _doJQueryOn($event, $element, $elementToModify, $jqueryCall, $param="", $preventDefault=false, $stopPropagation=false, $jsCallback="", $immediatly=true) {
+		return $this->_add_event($element, $this->_doJQuery($elementToModify, $jqueryCall, $param, $jsCallback), $event, $preventDefault, $stopPropagation, $immediatly);
 	}
 
 	/**
@@ -486,7 +486,7 @@ 
 		$preventDefault=false;
 		$immediatly=true;
 		extract($parameters);
-		return $this->_doJQueryOn($event, $element, $elementToModify, $jqueryCall, $param, $preventDefault, $stopPropagation, $jsCallback,$immediatly);
+		return $this->_doJQueryOn($event, $element, $elementToModify, $jqueryCall, $param, $preventDefault, $stopPropagation, $jsCallback, $immediatly);
 	}
 
 	/**
@@ -527,7 +527,7 @@ 
 		$preventDefault=false;
 		$immediatly=true;
 		extract($parameters);
-		$script=$this->_add_event($element, $this->exec($js), $event, $preventDefault, $stopPropagation,$immediatly);
+		$script=$this->_add_event($element, $this->exec($js), $event, $preventDefault, $stopPropagation, $immediatly);
 		return $script;
 	}
 	
@@ -536,10 +536,10 @@ 
 	 * @param string $element The element selector
 	 * @param array $parameters default : array("attr"=>"id","preventDefault"=>false,"stopPropagation"=>false,"immediatly"=>true)
 	 */
-	public function setDraggable($element,$parameters=[]){
+	public function setDraggable($element, $parameters=[]) {
 		$attr="id";
 		extract($parameters);
-		$script=$this->_add_event($element, Javascript::draggable($attr), "dragstart",$parameters);
+		$script=$this->_add_event($element, Javascript::draggable($attr), "dragstart", $parameters);
 		return $script;
 	}
 	
@@ -549,13 +549,13 @@ 
 	 * @param array $parameters default : array("attr"=>"id","stopPropagation"=>false,"immediatly"=>true,"jqueryDone"=>"append")
 	 * @param string $jsCallback the js script to call when element is dropped
 	 */
-	public function asDropZone($element,$jsCallback="",$parameters=[]){
+	public function asDropZone($element, $jsCallback="", $parameters=[]) {
 		$stopPropagation=false;
 		$immediatly=true;
 		$jqueryDone="append";
-		$script=$this->_add_event($element, '', "dragover",true,$stopPropagation,$immediatly);
+		$script=$this->_add_event($element, '', "dragover", true, $stopPropagation, $immediatly);
 		extract($parameters);
-		$script.=$this->_add_event($element, Javascript::dropZone($jqueryDone,$jsCallback), "drop",true,$stopPropagation,$immediatly);
+		$script.=$this->_add_event($element, Javascript::dropZone($jqueryDone, $jsCallback), "drop", true, $stopPropagation, $immediatly);
 		return $script;
 	}
 }

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

Spacing +22 added lines, -22 removed lines

@@ -20,19 +20,19 @@ 
 
 	public function __construct($identifier) {
 		parent::__construct($identifier, "tr", "");
-		$this->_states=[ State::ACTIVE,State::POSITIVE,State::NEGATIVE,State::WARNING,State::ERROR,State::DISABLED ];
+		$this->_states=[State::ACTIVE, State::POSITIVE, State::NEGATIVE, State::WARNING, State::ERROR, State::DISABLED];
 	}
 
 	public function setColCount($colCount) {
 		$count=$this->count();
-		for($i=$count; $i < $colCount; $i++) {
+		for ($i=$count; $i<$colCount; $i++) {
 			$item=$this->addItem(NULL);
 			$item->setTagName($this->_tdTagName);
 		}
 		return $this;
 	}
 
-	public function getColCount(){
+	public function getColCount() {
 		return $this->count();
 	}
 
@@ -52,7 +52,7 @@ 
 	/**
 	 * @return HtmlTD
 	 */
-	public function getItem($index){
+	public function getItem($index) {
 		return parent::getItem($index);
 	}
 
@@ -75,7 +75,7 @@ 
 	 * @param mixed $values
 	 */
 	public function setValues($values=array()) {
-		return $this->_addOrSetValues($values, function(HtmlTD &$cell,$value){$cell->setValue($value);});
+		return $this->_addOrSetValues($values, function(HtmlTD &$cell, $value) {$cell->setValue($value); });
 	}
 
 	/**
@@ -83,27 +83,27 @@ 
 	 * @param mixed $values
 	 */
 	public function addValues($values=array()) {
-		return $this->_addOrSetValues($values, function(HtmlTD &$cell,$value){$cell->addValue($value);});
+		return $this->_addOrSetValues($values, function(HtmlTD &$cell, $value) {$cell->addValue($value); });
 	}
 
 	/**
 	 * Sets or adds values to the row cols
 	 * @param mixed $values
 	 */
-	protected function _addOrSetValues($values,$callback) {
+	protected function _addOrSetValues($values, $callback) {
 		$count=$this->count();
 		if (!\is_array($values)) {
 			$values=\array_fill(0, $count, $values);
 		} else {
-			if (JArray::isAssociative($values) === true) {
+			if (JArray::isAssociative($values)===true) {
 				$values=\array_values($values);
 			}
 		}
 		$count=\min(\sizeof($values), $count);
 
-		for($i=0; $i < $count; $i++) {
+		for ($i=0; $i<$count; $i++) {
 			$cell=$this->content[$i];
-			$callback($cell,$values[$i]);
+			$callback($cell, $values[$i]);
 		}
 		return $this;
 	}
@@ -127,24 +127,24 @@ 
 	}
 
 	public function getColPosition($colIndex) {
-		if($this->_container->_isMerged()!==true)
+		if ($this->_container->_isMerged()!==true)
 			return $colIndex;
 		$pos=0;
 		$rows=$this->_container->getContent();
-		for($i=0; $i < $this->_row; $i++) {
+		for ($i=0; $i<$this->_row; $i++) {
 			$max=\min($colIndex, $rows[$i]->count());
-			for($j=0; $j < $max; $j++) {
+			for ($j=0; $j<$max; $j++) {
 				$rowspan=$rows[$i]->getItem($j)->getRowspan();
-				if ($rowspan + $i > $this->_row)
+				if ($rowspan+$i>$this->_row)
 					$pos++;
 			}
 		}
-		if ($pos > $colIndex)
+		if ($pos>$colIndex)
 			return NULL;
 		$count=$this->count();
-		for($i=0; $i < $count; $i++) {
+		for ($i=0; $i<$count; $i++) {
 			$pos+=$this->content[$i]->getColspan();
-			if ($pos >= $colIndex + 1)
+			if ($pos>=$colIndex+1)
 				return $i;
 		}
 		return null;
@@ -152,7 +152,7 @@ 
 
 	public function conditionalCellFormat($callback, $format) {
 		$cells=$this->content;
-		foreach ( $cells as $cell ) {
+		foreach ($cells as $cell) {
 			$cell->conditionalCellFormat($callback, $format);
 		}
 		return $this;
@@ -167,8 +167,8 @@ 
 
 	public function containsStr($needle) {
 		$cells=$this->content;
-		foreach ( $cells as $cell ) {
-			if (\strpos($cell->getContent(), $needle) !== false)
+		foreach ($cells as $cell) {
+			if (\strpos($cell->getContent(), $needle)!==false)
 				return true;
 		}
 		return false;
@@ -181,13 +181,13 @@ 
 
 	public function applyCells($callback) {
 		$cells=$this->content;
-		foreach ( $cells as $cell ) {
+		foreach ($cells as $cell) {
 			$cell->apply($callback);
 		}
 		return $this;
 	}
 
-	public function toDelete($colIndex){
+	public function toDelete($colIndex) {
 		$this->getItem($colIndex)->toDelete();
 		return $this;
 	}

Ajax/semantic/html/collections/HtmlBreadcrumb.php

Spacing +16 added lines, -16 removed lines

@@ -52,7 +52,7 @@ 
 		$this->startIndex=$startIndex;
 		$this->autoActive=$autoActive;
 		$this->_contentSeparator="<div class='divider'> / </div>";
-		$this->_hrefFunction=function (HtmlSemDoubleElement $e) {
+		$this->_hrefFunction=function(HtmlSemDoubleElement $e) {
 			return $e->getContent();
 		};
 		if (isset($hrefFunction)) {
@@ -68,7 +68,7 @@ 
 	 * @return HtmlBreadcrumb
 	 */
 	public function autoGetOnClick($targetSelector) {
-		return $this->getOnClick($this->root, $targetSelector, array ("attr" => $this->attr ));
+		return $this->getOnClick($this->root, $targetSelector, array("attr" => $this->attr));
 	}
 
 	public function contentAsString() {
@@ -83,7 +83,7 @@ 
 	 */
 	public function setActive($index=null) {
 		if (!isset($index)) {
-			$index=sizeof($this->content) - 1;
+			$index=sizeof($this->content)-1;
 		}
 		$activeItem=$this->content[$index];
 		$activeItem->addToProperty("class", "active");
@@ -96,7 +96,7 @@ 
 	 * @param object $dispatcher the request dispatcher
 	 * @return HtmlBreadcrumb
 	 */
-	public function fromDispatcher(JsUtils $js,$dispatcher, $startIndex=0) {
+	public function fromDispatcher(JsUtils $js, $dispatcher, $startIndex=0) {
 		$this->startIndex=$startIndex;
 		return $this->addItems($js->fromDispatcher($dispatcher));
 	}
@@ -111,12 +111,12 @@ 
 		if (!isset($index)) {
 			$index=sizeof($this->content);
 		}
-		if ($this->absolutePaths === true) {
+		if ($this->absolutePaths===true) {
 			return $this->_hrefFunction($this->content[$index]);
 		} else {
-			return $this->root . implode($separator, array_slice(array_map(function ($e) {
+			return $this->root.implode($separator, array_slice(array_map(function($e) {
 				return $this->_hrefFunction($e);
-			}, $this->content), $this->startIndex, $index + 1));
+			}, $this->content), $this->startIndex, $index+1));
 		}
 	}
 
@@ -150,8 +150,8 @@ 
 			$this->setActive();
 		}
 		$count=$this->count();
-		for($i=1; $i < $count; $i++) {
-			$this->content[$i]->wrap($this->getContentDivider($i - 1));
+		for ($i=1; $i<$count; $i++) {
+			$this->content[$i]->wrap($this->getContentDivider($i-1));
 		}
 		return parent::compile($js, $view);
 	}
@@ -161,15 +161,15 @@ 
 	 * @see \Ajax\bootstrap\html\base\BaseHtml::on()
 	 */
 	public function on($event, $jsCode, $stopPropagation=false, $preventDefault=false) {
-		foreach ( $this->content as $element ) {
+		foreach ($this->content as $element) {
 			$element->on($event, $jsCode, $stopPropagation, $preventDefault);
 		}
 		return $this;
 	}
 
 	public function _ajaxOn($operation, $event, $url, $responseElement="", $parameters=array()) {
-		foreach ( $this->content as $element ) {
-			if ($element->getProperty($this->attr) != NULL){
+		foreach ($this->content as $element) {
+			if ($element->getProperty($this->attr)!=NULL) {
 				$element->_ajaxOn($operation, $event, $url, $responseElement, $parameters);
 			}
 		}
@@ -184,7 +184,7 @@ 
 	 */
 	protected function createItem($value) {
 		$count=$this->count();
-		$itemO=new HtmlSemDoubleElement("item-" . $this->identifier . "-" . $count, "a", "section");
+		$itemO=new HtmlSemDoubleElement("item-".$this->identifier."-".$count, "a", "section");
 		if (\is_array($value))
 			$itemO->fromArray($value);
 		else {
@@ -196,7 +196,7 @@ 
 	public function addIconAt($icon, $index) {
 		$item=$this->getItem($index);
 		if (isset($item)) {
-			$icon=new HtmlIcon("icon-" . $this->identifier, $icon);
+			$icon=new HtmlIcon("icon-".$this->identifier, $icon);
 			$item->wrapContent($icon);
 		}
 	}
@@ -204,7 +204,7 @@ 
 	public function addItem($item) {
 		$count=$this->count();
 		$itemO=parent::addItem($item);
-		$this->addToPropertyCtrl("class", "section", array ("section" ));
+		$this->addToPropertyCtrl("class", "section", array("section"));
 		$itemO->setProperty($this->attr, $this->getHref($count));
 		return $itemO;
 	}
@@ -220,7 +220,7 @@ 
 	public function setAbsolutePaths($absolutePaths) {
 		$this->absolutePaths=$absolutePaths;
 		$size=\sizeof($this->content);
-		for($i=0;$i<$size;$i++){
+		for ($i=0; $i<$size; $i++) {
 			$this->content[$i]->setProperty($this->attr, $this->getHref($i));
 		}
 		return $this;

Ajax/common/html/BaseHtml.php

Spacing +48 added lines, -48 removed lines

@@ -15,11 +15,11 @@ 
  * @version 1.3
  */
 abstract class BaseHtml extends BaseWidget {
-	use BaseHtmlEventsTrait,BaseHtmlPropertiesTrait;
+	use BaseHtmlEventsTrait, BaseHtmlPropertiesTrait;
 	protected $_template;
 	protected $tagName;
-	protected $_wrapBefore=array ();
-	protected $_wrapAfter=array ();
+	protected $_wrapBefore=array();
+	protected $_wrapAfter=array();
 	protected $_bsComponent;
 	protected $_compiled=false;
 	protected $_postCompile;
@@ -32,14 +32,14 @@ 
 	 */
 	abstract public function run(JsUtils $js);
 
-	private function _callSetter($setter,$key,$value,&$array){
+	private function _callSetter($setter, $key, $value, &$array) {
 		$result=false;
-		if (method_exists($this, $setter) && substr($setter, 0, 1) !== "_") {
+		if (method_exists($this, $setter) && substr($setter, 0, 1)!=="_") {
 			try {
 				$this->$setter($value);
 				unset($array[$key]);
 				$result=true;
-			} catch ( \Exception $e ) {
+			}catch (\Exception $e) {
 				$result=false;
 			}
 		}
@@ -47,17 +47,17 @@ 
 	}
 
 	protected function getTemplate(JsUtils $js=NULL) {
-		return PropertyWrapper::wrap($this->_wrapBefore, $js) . $this->_template . PropertyWrapper::wrap($this->_wrapAfter, $js);
+		return PropertyWrapper::wrap($this->_wrapBefore, $js).$this->_template.PropertyWrapper::wrap($this->_wrapAfter, $js);
 	}
 
 	protected function ctrl($name, $value, $typeCtrl) {
 		if (\is_array($typeCtrl)) {
-			if (array_search($value, $typeCtrl) === false) {
-				throw new \Exception("La valeur passée `" . $value . "` à la propriété `" . $name . "` ne fait pas partie des valeurs possibles : {" . implode(",", $typeCtrl) . "}");
+			if (array_search($value, $typeCtrl)===false) {
+				throw new \Exception("La valeur passée `".$value."` à la propriété `".$name."` ne fait pas partie des valeurs possibles : {".implode(",", $typeCtrl)."}");
 			}
 		} else {
 			if (!$typeCtrl($value)) {
-				throw new \Exception("La fonction " . $typeCtrl . " a retourné faux pour l'affectation de la propriété " . $name);
+				throw new \Exception("La fonction ".$typeCtrl." a retourné faux pour l'affectation de la propriété ".$name);
 			}
 		}
 		return true;
@@ -74,7 +74,7 @@ 
 	protected function addToMemberUnique(&$name, $value, $typeCtrl, $separator=" ") {
 		if (\is_array($typeCtrl)) {
 			$this->removeOldValues($name, $typeCtrl);
-			$name.=$separator . $value;
+			$name.=$separator.$value;
 		}
 		return $this;
 	}
@@ -86,12 +86,12 @@ 
 		if (\is_array($typeCtrl)) {
 			$this->removeOldValues($name, $typeCtrl);
 		}
-		$name.=$separator . $value;
+		$name.=$separator.$value;
 		return $this;
 	}
 
 	protected function addToMember(&$name, $value, $separator=" ") {
-		$name=str_ireplace($value, "", $name) . $separator . $value;
+		$name=str_ireplace($value, "", $name).$separator.$value;
 		return $this;
 	}
 
@@ -102,18 +102,18 @@ 
 		$oldValue=trim($oldValue);
 	}
 
-	protected function _getElementBy($callback,$elements){
+	protected function _getElementBy($callback, $elements) {
 		if (\is_array($elements)) {
 			$elements=\array_values($elements);
 			$flag=false;
 			$index=0;
-			while ( !$flag && $index < sizeof($elements) ) {
+			while (!$flag && $index<sizeof($elements)) {
 				if ($elements[$index] instanceof BaseHtml)
 					$flag=($callback($elements[$index]));
 					$index++;
 			}
-			if ($flag === true)
-				return $elements[$index - 1];
+			if ($flag===true)
+				return $elements[$index-1];
 		} elseif ($elements instanceof BaseHtml) {
 			if ($callback($elements))
 				return $elements;
@@ -141,13 +141,13 @@ 
 	}
 
 	public function fromArray($array) {
-		foreach ( $this as $key => $value ) {
-			if(array_key_exists($key, $array)===true)
-				$this->_callSetter("set" . ucfirst($key), $key, $array[$key], $array);
+		foreach ($this as $key => $value) {
+			if (array_key_exists($key, $array)===true)
+				$this->_callSetter("set".ucfirst($key), $key, $array[$key], $array);
 		}
-		foreach ( $array as $key => $value ) {
-			if($this->_callSetter($key, $key, $value, $array)===false){
-				$this->_callSetter("set" . ucfirst($key), $key, $value, $array);
+		foreach ($array as $key => $value) {
+			if ($this->_callSetter($key, $key, $value, $array)===false) {
+				$this->_callSetter("set".ucfirst($key), $key, $value, $array);
 			}
 		}
 		return $array;
@@ -155,7 +155,7 @@ 
 
 	public function fromDatabaseObjects($objects, $function) {
 		if (isset($objects)) {
-			foreach ( $objects as $object ) {
+			foreach ($objects as $object) {
 				$this->fromDatabaseObject($object, $function);
 			}
 		}
@@ -176,7 +176,7 @@ 
 
 
 	public function getElementById($identifier, $elements) {
-		return $this->_getElementBy(function(BaseWidget $element) use ($identifier){return $element->getIdentifier()===$identifier;}, $elements);
+		return $this->_getElementBy(function(BaseWidget $element) use ($identifier){return $element->getIdentifier()===$identifier; }, $elements);
 	}
 
 	public function getBsComponent() {
@@ -189,14 +189,14 @@ 
 	}
 
 	protected function compile_once(JsUtils $js=NULL, &$view=NULL) {
-		if(!$this->_compiled){
-			if(isset($js)){
+		if (!$this->_compiled) {
+			if (isset($js)) {
 				$beforeCompile=$js->getParam("beforeCompileHtml");
-				if(\is_callable($beforeCompile)){
-					$beforeCompile($this,$js,$view);
+				if (\is_callable($beforeCompile)) {
+					$beforeCompile($this, $js, $view);
 				}
 			}
-			if(\is_callable($this->_preCompile)){
+			if (\is_callable($this->_preCompile)) {
 				$pc=$this->_preCompile;
 				$pc($this);
 			}
@@ -206,15 +206,15 @@ 
 	}
 
 	public function compile(JsUtils $js=NULL, &$view=NULL) {
-		$this->compile_once($js,$view);
+		$this->compile_once($js, $view);
 		$result=$this->getTemplate($js);
-		foreach ( $this as $key => $value ) {
-				if(\strstr($result, "%{$key}%")!==false){
+		foreach ($this as $key => $value) {
+				if (\strstr($result, "%{$key}%")!==false) {
 					if (\is_array($value)) {
 						$v=PropertyWrapper::wrap($value, $js);
-					}elseif($value instanceof \stdClass){
-							$v=\print_r($value,true);
-					}else{
+					}elseif ($value instanceof \stdClass) {
+							$v=\print_r($value, true);
+					} else {
 						$v=$value;
 					}
 					$result=str_replace("%{$key}%", $v, $result);
@@ -222,12 +222,12 @@ 
 		}
 		if (isset($js)===true) {
 			$this->run($js);
-			if (isset($view) === true) {
+			if (isset($view)===true) {
 				$js->addViewElement($this->_identifier, $result, $view);
 			}
 		}
 
-		if(\is_callable($this->_postCompile)){
+		if (\is_callable($this->_postCompile)) {
 			$pc=$this->_postCompile;
 			$pc($this);
 		}
@@ -241,13 +241,13 @@ 
 	 * @param array $parameters default: ["jsCallback"=>"","jqueryDone"=>"append"]
 	 * @return \Ajax\common\html\BaseHtml
 	 */
-	public function setDraggable($attr="id",$dropZone=null,$parameters=[]){
+	public function setDraggable($attr="id", $dropZone=null, $parameters=[]) {
 		$this->setProperty("draggable", "true");
-		$this->addEvent("dragstart",Javascript::draggable($attr));
-		if(isset($dropZone)&& $dropZone instanceof BaseHtml){
-			$jqueryDone="append";$jsCallback="";
+		$this->addEvent("dragstart", Javascript::draggable($attr));
+		if (isset($dropZone) && $dropZone instanceof BaseHtml) {
+			$jqueryDone="append"; $jsCallback="";
 			extract($parameters);
-			$dropZone->asDropZone($jsCallback,$jqueryDone,$parameters);
+			$dropZone->asDropZone($jsCallback, $jqueryDone, $parameters);
 		}
 		return $this;
 	}
@@ -259,11 +259,11 @@ 
 	 * @param array $parameters
 	 * @return \Ajax\common\html\BaseHtml
 	 */
-	public function asDropZone($jsCallback="",$jqueryDone="append",$parameters=[]){
+	public function asDropZone($jsCallback="", $jqueryDone="append", $parameters=[]) {
 		$stopPropagation=false;
-		$this->addEvent("dragover", '', $stopPropagation,true);
+		$this->addEvent("dragover", '', $stopPropagation, true);
 		extract($parameters);
-		$this->addEvent("drop",Javascript::dropZone($jqueryDone,$jsCallback),$stopPropagation,true);
+		$this->addEvent("drop", Javascript::dropZone($jqueryDone, $jsCallback), $stopPropagation, true);
 		return $this;
 	}
 
@@ -271,11 +271,11 @@ 
 		return $this->compile();
 	}
 
-	public function onPostCompile($callback){
+	public function onPostCompile($callback) {
 		$this->_postCompile=$callback;
 	}
 
-	public function onPreCompile($callback){
+	public function onPreCompile($callback) {
 		$this->_preCompile=$callback;
 	}
 }

Ajax/common/html/HtmlCollection.php

Spacing +52 added lines, -52 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;
 	}
 
@@ -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,17 +158,17 @@ 
 	 * @param array|mixed $values
 	 * @return $this
 	 */
-	public function setPropertyValues($property,$values){
+	public function setPropertyValues($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)){
-				$c->setProperty($property,$value);
+			if (isset($c)) {
+				$c->setProperty($property, $value);
 			}
-			else{
+			else {
 				return $this;
 			}
 		}
@@ -181,17 +181,17 @@ 
 	 * @param array|mixed $values
 	 * @return $this
 	 */
-	public function addPropertyValues($property,$values){
+	public function addPropertyValues($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)){
-				$c->addToProperty($property,$value);
+			if (isset($c)) {
+				$c->addToProperty($property, $value);
 			}
-			else{
+			else {
 				return $this;
 			}
 		}
@@ -201,13 +201,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);
 	}
 
@@ -216,13 +216,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;