phpMv / phpMv-UI

Ajax/semantic/widgets/base/InstanceViewer.php

Spacing +112 added lines, -112 removed lines

@@ -29,17 +29,17 @@ 
 
 	protected $groupByFields;
 
-	public static $index = 0;
+	public static $index=0;
 
-	public function __construct($identifier, $instance = NULL, $captions = NULL) {
-		$this->widgetIdentifier = $identifier;
-		$this->values = [];
-		$this->afterCompile = [];
+	public function __construct($identifier, $instance=NULL, $captions=NULL) {
+		$this->widgetIdentifier=$identifier;
+		$this->values=[];
+		$this->afterCompile=[];
 		if (isset($instance))
 			$this->setInstance($instance);
 		$this->setCaptions($captions);
-		$this->captionCallback = NULL;
-		$this->defaultValueFunction = function ($name, $value) {
+		$this->captionCallback=NULL;
+		$this->defaultValueFunction=function($name, $value) {
 			return $value;
 		};
 	}
@@ -66,47 +66,47 @@ 
 	}
 
 	public function getValues() {
-		$values = [];
-		$index = 0;
-		$count = $this->count();
-		$hasGroupby = is_array($this->groupByFields);
-		if (! $hasGroupby) {
-			while ($index < $count) {
-				$values[] = $this->getValue($index ++);
+		$values=[];
+		$index=0;
+		$count=$this->count();
+		$hasGroupby=is_array($this->groupByFields);
+		if (!$hasGroupby) {
+			while ($index<$count) {
+				$values[]=$this->getValue($index++);
 			}
 		} else {
-			while ($index < $count) {
-				if (array_search($index, $this->groupByFields) === false) {
-					$values[] = $this->getValue($index);
+			while ($index<$count) {
+				if (array_search($index, $this->groupByFields)===false) {
+					$values[]=$this->getValue($index);
 				}
-				$index ++;
+				$index++;
 			}
 		}
 		return $values;
 	}
 
-	public function getIdentifier($index = NULL) {
-		if (! isset($index))
-			$index = self::$index;
-		$value = $index;
+	public function getIdentifier($index=NULL) {
+		if (!isset($index))
+			$index=self::$index;
+		$value=$index;
 		if (isset($this->values["identifier"])) {
 			if (\is_string($this->values["identifier"]))
-				$value = JReflection::callMethod($this->instance, $this->values["identifier"], []);
+				$value=JReflection::callMethod($this->instance, $this->values["identifier"], []);
 			else
-				$value = $this->values["identifier"]($index, $this->instance);
+				$value=$this->values["identifier"]($index, $this->instance);
 		}
 		return $value;
 	}
 
 	public function getValue($index) {
-		$property = $this->properties[$index];
+		$property=$this->properties[$index];
 		return $this->_getValue($property, $index);
 	}
 
 	protected function _beforeAddProperty($index, &$field) {}
 
 	protected function _getDefaultValue($name, $value, $index) {
-		$func = $this->defaultValueFunction;
+		$func=$this->defaultValueFunction;
 		return $func($name, $value, $index, $this->instance);
 	}
 
@@ -116,27 +116,27 @@ 
 	}
 
 	protected function _getValue($property, $index) {
-		$value = null;
-		$propertyName = $property;
+		$value=null;
+		$propertyName=$property;
 		if ($property instanceof \ReflectionProperty) {
-			$value = $this->_getPropertyValue($property);
-			$propertyName = $property->getName();
-		} elseif (\is_callable($property) && \array_search($property, ['system','date']) === false){
-			try{
-				$value = $property($this->instance);
-			}catch(\Error $e){}
+			$value=$this->_getPropertyValue($property);
+			$propertyName=$property->getName();
+		} elseif (\is_callable($property) && \array_search($property, ['system', 'date'])===false) {
+			try {
+				$value=$property($this->instance);
+			}catch (\Error $e) {}
 		}
 		elseif (\is_array($property)) {
-			$values = \array_map(function ($v) use ($index) {
+			$values=\array_map(function($v) use ($index) {
 				return $this->_getValue($v, $index);
 			}, $property);
-			$value = \implode('', $values);
+			$value=\implode('', $values);
 		} elseif (\is_string($property)) {
-			$value = '';
+			$value='';
 			if (isset($this->instance->{$property})) {
-				$value = $this->instance->{$property};
-			} elseif (\method_exists($this->instance, $getter = JReflection::getterName($property))) {
-				$value = JReflection::callMethod($this->instance, $getter, []);
+				$value=$this->instance->{$property};
+			} elseif (\method_exists($this->instance, $getter=JReflection::getterName($property))) {
+				$value=JReflection::callMethod($this->instance, $getter, []);
 			}
 		}
 
@@ -145,9 +145,9 @@ 
 
 	protected function _postGetValue($index, $propertyName, $value) {
 		if (isset($this->values[$index])) {
-			$value = $this->values[$index]($value, $this->instance, $index, self::$index);
+			$value=$this->values[$index]($value, $this->instance, $index, self::$index);
 		} else {
-			$value = $this->_getDefaultValue($propertyName, $value, $index);
+			$value=$this->_getDefaultValue($propertyName, $value, $index);
 		}
 		if (isset($this->afterCompile[$index])) {
 			if (\is_callable($this->afterCompile[$index])) {
@@ -157,7 +157,7 @@ 
 		return $value;
 	}
 
-	public function insertField($index, $field, $key = null) {
+	public function insertField($index, $field, $key=null) {
 		if (isset($key)) {
 			array_splice($this->visibleProperties, $index, 0, [
 				$key => $field
@@ -171,29 +171,29 @@ 
 	public function sortColumnContent($index, $array) {
 		if (isset($this->visibleProperties[$index])) {
 			if (is_array($this->visibleProperties[$index])) {
-				$this->visibleProperties[$index] = JArray::sortAssociative($this->visibleProperties[$index], $array);
+				$this->visibleProperties[$index]=JArray::sortAssociative($this->visibleProperties[$index], $array);
 			}
 		}
 		return $this;
 	}
 
-	public function insertInField($index, $field, $key = null) {
-		$vb = $this->visibleProperties;
+	public function insertInField($index, $field, $key=null) {
+		$vb=$this->visibleProperties;
 		if (isset($vb[$index])) {
 			if (isset($key)) {
 				if (\is_array($vb[$index])) {
-					$this->visibleProperties[$index][$key] = $field;
+					$this->visibleProperties[$index][$key]=$field;
 				} else {
-					$this->visibleProperties[$index] = [
+					$this->visibleProperties[$index]=[
 						$vb[$index],
 						$key => $field
 					];
 				}
 			} else {
 				if (\is_array($vb[$index])) {
-					$this->visibleProperties[$index][] = $field;
+					$this->visibleProperties[$index][]=$field;
 				} else {
-					$this->visibleProperties[$index] = [
+					$this->visibleProperties[$index]=[
 						$vb[$index],
 						$field
 					];
@@ -205,19 +205,19 @@ 
 		return $this;
 	}
 
-	public function addField($field, $key = null) {
+	public function addField($field, $key=null) {
 		if (isset($key)) {
-			$this->visibleProperties[] = [
+			$this->visibleProperties[]=[
 				$key => $field
 			];
 		} else {
-			$this->visibleProperties[] = $field;
+			$this->visibleProperties[]=$field;
 		}
 		return $this;
 	}
 
 	public function addFields($fields) {
-		$this->visibleProperties = \array_merge($this->visibleProperties, $fields);
+		$this->visibleProperties=\array_merge($this->visibleProperties, $fields);
 		return $this;
 	}
 
@@ -234,37 +234,37 @@ 
 	}
 
 	public function getFieldName($index) {
-		$property = $this->getProperty($index);
+		$property=$this->getProperty($index);
 		if ($property instanceof \ReflectionProperty) {
-			$result = $property->getName();
+			$result=$property->getName();
 		} elseif (\is_callable($property)) {
-			$result = $this->visibleProperties[$index];
+			$result=$this->visibleProperties[$index];
 		} else {
-			$result = $property;
+			$result=$property;
 		}
 		return $result;
 	}
 
 	protected function showableProperty(\ReflectionProperty $rProperty) {
-		return JString::startswith($rProperty->getName(), "_") === false;
+		return JString::startswith($rProperty->getName(), "_")===false;
 	}
 
 	public function setInstance($instance) {
 		if (\is_string($instance) && \class_exists($instance)) {
-			$instance = new $instance();
+			$instance=new $instance();
 		}
-		$this->instance = $instance;
-		$this->properties = [];
-		try{
-			$this->reflect = new \ReflectionClass($instance);
-			if (JArray::count($this->visibleProperties) === 0) {
-				$this->properties = $this->getDefaultProperties();
+		$this->instance=$instance;
+		$this->properties=[];
+		try {
+			$this->reflect=new \ReflectionClass($instance);
+			if (JArray::count($this->visibleProperties)===0) {
+				$this->properties=$this->getDefaultProperties();
 			} else {
 				foreach ($this->visibleProperties as $property) {
 					$this->setInstanceProperty($property);
 				}
 			}
-		}catch (\Throwable $th){
+		}catch (\Throwable $th) {
 			
 		}
 		return $this;
@@ -272,56 +272,56 @@ 
 
 	private function setInstanceProperty($property) {
 		if (\is_callable($property)) {
-			$this->properties[] = $property;
+			$this->properties[]=$property;
 		} elseif (\is_string($property)) {
 			try {
 				$this->_beforeAddProperty(\sizeof($this->properties), $property);
-				$rProperty = $this->reflect->getProperty($property);
-				$this->properties[] = $rProperty;
-			} catch (\Exception $e) {
+				$rProperty=$this->reflect->getProperty($property);
+				$this->properties[]=$rProperty;
+			}catch (\Exception $e) {
 				$this->_beforeAddProperty(\sizeof($this->properties), $property);
-				$this->properties[] = $property;
+				$this->properties[]=$property;
 			}
 		} elseif (\is_int($property)) {
-			$props = $this->getDefaultProperties();
+			$props=$this->getDefaultProperties();
 			if (isset($props[$property]))
-				$this->properties[] = $props[$property];
+				$this->properties[]=$props[$property];
 			else
-				$this->properties[] = $property;
+				$this->properties[]=$property;
 		} else {
-			$this->properties[] = $property;
+			$this->properties[]=$property;
 		}
 	}
 
 	protected function getDefaultProperties() {
-		$result = [];
-		$properties = $this->reflect->getProperties();
+		$result=[];
+		$properties=$this->reflect->getProperties();
 		foreach ($properties as $property) {
-			$showable = $this->showableProperty($property);
-			if ($showable !== false) {
-				$result[] = $property;
+			$showable=$this->showableProperty($property);
+			if ($showable!==false) {
+				$result[]=$property;
 			}
 		}
 		return $result;
 	}
 
 	public function setVisibleProperties($visibleProperties) {
-		$this->visibleProperties = $visibleProperties;
+		$this->visibleProperties=$visibleProperties;
 		return $this;
 	}
 
 	public function setValueFunction($index, $callback) {
-		$this->values[$index] = $callback;
+		$this->values[$index]=$callback;
 		return $this;
 	}
 
 	public function setIdentifierFunction($callback) {
-		$this->values["identifier"] = $callback;
+		$this->values["identifier"]=$callback;
 		return $this;
 	}
 
 	public static function setIndex($index) {
-		self::$index = $index;
+		self::$index=$index;
 	}
 
 	public function getProperties() {
@@ -341,43 +341,43 @@ 
 	}
 
 	public function getCaptions() {
-		$hasGroupby = is_array($this->groupByFields);
-		$count = $this->count();
-		$moreAdded = false;
+		$hasGroupby=is_array($this->groupByFields);
+		$count=$this->count();
+		$moreAdded=false;
 		if (isset($this->captions)) {
-			$captions = \array_values($this->captions);
-			$gbSize = $hasGroupby ? sizeof($this->groupByFields) : 0;
-			$captionsSize = \sizeof($captions);
-			for ($i = $captionsSize; $i < $count - $gbSize; $i ++) {
-				$captions[] = "";
-				$moreAdded = true;
+			$captions=\array_values($this->captions);
+			$gbSize=$hasGroupby ? sizeof($this->groupByFields) : 0;
+			$captionsSize=\sizeof($captions);
+			for ($i=$captionsSize; $i<$count-$gbSize; $i++) {
+				$captions[]="";
+				$moreAdded=true;
 			}
 		} else {
-			$captions = [];
-			$index = 0;
-			while ($index < $count) {
-				$captions[] = $this->getCaption($index ++);
+			$captions=[];
+			$index=0;
+			while ($index<$count) {
+				$captions[]=$this->getCaption($index++);
 			}
 		}
-		if ($hasGroupby && sizeof($captions) >= $count && ! $moreAdded) {
-			$captions = JArray::removeByKeys($captions, $this->groupByFields);
+		if ($hasGroupby && sizeof($captions)>=$count && !$moreAdded) {
+			$captions=JArray::removeByKeys($captions, $this->groupByFields);
 		}
 		if (isset($this->captionCallback) && \is_callable($this->captionCallback)) {
-			$callback = $this->captionCallback;
+			$callback=$this->captionCallback;
 			$callback($captions, $this->instance);
 		}
 		return $captions;
 	}
 
 	public function setCaption($index, $caption) {
-		if (isset($this->captions) === false)
-			$this->captions = [];
-		$this->captions[$index] = $caption;
+		if (isset($this->captions)===false)
+			$this->captions=[];
+		$this->captions[$index]=$caption;
 		return $this;
 	}
 
 	public function setCaptions($captions) {
-		$this->captions = $captions;
+		$this->captions=$captions;
 		return $this;
 	}
 
@@ -392,7 +392,7 @@ 
 	 * @return InstanceViewer
 	 */
 	public function afterCompile($index, $callback) {
-		$this->afterCompile[$index] = $callback;
+		$this->afterCompile[$index]=$callback;
 		return $this;
 	}
 
@@ -404,7 +404,7 @@ 
 	 * @return \Ajax\semantic\widgets\base\InstanceViewer
 	 */
 	public function setCaptionCallback($captionCallback) {
-		$this->captionCallback = $captionCallback;
+		$this->captionCallback=$captionCallback;
 		return $this;
 	}
 
@@ -416,7 +416,7 @@ 
 	 * @return \Ajax\semantic\widgets\base\InstanceViewer
 	 */
 	public function setDefaultValueFunction($defaultValueFunction) {
-		$this->defaultValueFunction = $defaultValueFunction;
+		$this->defaultValueFunction=$defaultValueFunction;
 		return $this;
 	}
 
@@ -425,8 +425,8 @@ 
 	}
 
 	public function getSimpleProperties() {
-		return array_filter($this->visibleProperties, function ($item) {
-			return ! (is_array($item) || is_object($item));
+		return array_filter($this->visibleProperties, function($item) {
+			return !(is_array($item) || is_object($item));
 		});
 	}
 
@@ -451,10 +451,10 @@ 
 	 * @param mixed $groupByFields
 	 */
 	public function setGroupByFields($groupByFields) {
-		$this->groupByFields = $groupByFields;
+		$this->groupByFields=$groupByFields;
 	}
 	
-	public function addGroupBy($groupByField){
+	public function addGroupBy($groupByField) {
 		$this->groupByFields[]=$groupByField;
 	}
 

Ajax/semantic/html/base/constants/icons/Animals.php

Spacing +1 added lines, -1 removed lines

@@ -5,5 +5,5 @@
 
 abstract class Animals extends BaseEnum {
 
-	const CAT = 'cat', CROW = 'crow', DOG = 'dog', DOVE = 'dove', DRAGON = 'dragon', FEATHER = 'feather', FEATHER_ALTERNATE = 'feather alternate', FISH = 'fish', FOG = 'frog', HIPPO = 'hippo', HORSE = 'horse', HORSE_HEAD = 'horse head', KIWI_BIRD = 'kiwi bird', OTTER = 'otter', PAW = 'paw', SPIDER = 'spider';
+	const CAT='cat', CROW='crow', DOG='dog', DOVE='dove', DRAGON='dragon', FEATHER='feather', FEATHER_ALTERNATE='feather alternate', FISH='fish', FOG='frog', HIPPO='hippo', HORSE='horse', HORSE_HEAD='horse head', KIWI_BIRD='kiwi bird', OTTER='otter', PAW='paw', SPIDER='spider';
 }

Ajax/common/BaseEnum.php

Spacing +27 added lines, -27 removed lines

@@ -10,65 +10,65 @@
  */
 abstract class BaseEnum {
 
-	private static $constCacheArray = NULL;
+	private static $constCacheArray=NULL;
 
-	private static $picked = [];
+	private static $picked=[];
 
 	public static function getConstants() {
-		if (self::$constCacheArray == NULL) {
-			self::$constCacheArray = [];
+		if (self::$constCacheArray==NULL) {
+			self::$constCacheArray=[];
 		}
-		$calledClass = get_called_class();
-		if (! \array_key_exists($calledClass, self::$constCacheArray)) {
-			$reflect = new \ReflectionClass($calledClass);
-			self::$constCacheArray[$calledClass] = $reflect->getConstants();
+		$calledClass=get_called_class();
+		if (!\array_key_exists($calledClass, self::$constCacheArray)) {
+			$reflect=new \ReflectionClass($calledClass);
+			self::$constCacheArray[$calledClass]=$reflect->getConstants();
 		}
 		return self::$constCacheArray[$calledClass];
 	}
 
-	public static function getConstantValues($postFix = "", $prefixBefore = false) {
-		if ($postFix == "")
+	public static function getConstantValues($postFix="", $prefixBefore=false) {
+		if ($postFix=="")
 			return \array_values(self::getConstants());
 		else {
-			if ($prefixBefore === false) {
-				return \array_map(function ($elem) use ($postFix) {
-					return $elem . " " . $postFix;
+			if ($prefixBefore===false) {
+				return \array_map(function($elem) use ($postFix) {
+					return $elem." ".$postFix;
 				}, \array_values(self::getConstants()));
 			} else {
-				return \array_map(function ($elem) use ($postFix) {
-					return $postFix . " " . $elem;
+				return \array_map(function($elem) use ($postFix) {
+					return $postFix." ".$elem;
 				}, \array_values(self::getConstants()));
 			}
 		}
 	}
 
-	public static function isValidName($name, $strict = false) {
-		$constants = self::getConstants();
+	public static function isValidName($name, $strict=false) {
+		$constants=self::getConstants();
 
 		if ($strict) {
 			return \array_key_exists($name, $constants);
 		}
 
-		$keys = \array_map('strtolower', array_keys($constants));
+		$keys=\array_map('strtolower', array_keys($constants));
 		return \in_array(\strtolower($name), $keys);
 	}
 
 	public static function isValidValue($value) {
-		$values = \array_values(self::getConstants());
+		$values=\array_values(self::getConstants());
 		return \in_array($value, $values, true);
 	}
 
-	public static function getRandomValue(bool $unique = false) {
-		$values = self::getConstantValues();
-		$count = \count($values);
-		$calledClass = \get_called_class();
-		if ($unique && $count > count(self::$picked[$calledClass] ?? [])) {
+	public static function getRandomValue(bool $unique=false) {
+		$values=self::getConstantValues();
+		$count=\count($values);
+		$calledClass=\get_called_class();
+		if ($unique && $count>count(self::$picked[$calledClass] ?? [])) {
 			do {
-				$newVal = $values[\rand(0, $count - 1)];
+				$newVal=$values[\rand(0, $count-1)];
 			} while (isset(self::$picked[$calledClass][$newVal]));
-			self::$picked[$calledClass][$newVal] = true;
+			self::$picked[$calledClass][$newVal]=true;
 			return $newVal;
 		}
-		return $values[\rand(0, $count - 1)];
+		return $values[\rand(0, $count-1)];
 	}
 }

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

Spacing +23 added lines, -23 removed lines

@@ -10,9 +10,9 @@ 
  */
 trait TableTrait {
 
-	abstract public function addEvent($event, $jsCode, $stopPropagation = false, $preventDefault = false);
+	abstract public function addEvent($event, $jsCode, $stopPropagation=false, $preventDefault=false);
 
-	abstract public function getOn($event, $url, $responseElement = "", $parameters = array());
+	abstract public function getOn($event, $url, $responseElement="", $parameters=array());
 
 	protected function addToPropertyTable($property, $value) {
 		return $this->_self->addToProperty($property, $value);
@@ -22,8 +22,8 @@ 
 		return $this->addToPropertyTable("class", "celled");
 	}
 
-	public function setBasic($very = false) {
-		$table = $this->_self;
+	public function setBasic($very=false) {
+		$table=$this->_self;
 		if ($very)
 			$table->addToPropertyCtrl("class", "very", array(
 				"very"
@@ -33,8 +33,8 @@ 
 		));
 	}
 
-	public function setCompact($very = false) {
-		$table = $this->_self;
+	public function setCompact($very=false) {
+		$table=$this->_self;
 		if ($very)
 			$table->addToPropertyCtrl("class", "very", array(
 				"very"
@@ -56,8 +56,8 @@ 
 		return $this->addToPropertyTable("class", "structured");
 	}
 
-	public function setSortable($colIndex = NULL) {
-		$table = $this->_self;
+	public function setSortable($colIndex=NULL) {
+		$table=$this->_self;
 		if (isset($colIndex) && $table->hasPart("thead")) {
 			$table->getHeader()->sort($colIndex);
 		}
@@ -80,30 +80,30 @@ 
 		return $this->addToPropertyTable("class", "striped");
 	}
 
-	public function onRowClick($jsCode, $stopPropagation = false, $preventDefault = false) {
+	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()) {
-		$activeClass = $this->_self->getActiveRowClass();
-		$jsCondition = '(!$(this).closest("tr").hasClass("' . $activeClass . '") || event.target.tagName === "TR")';
+	public function getOnRow($event, $url, $responseElement="", $parameters=array()) {
+		$activeClass=$this->_self->getActiveRowClass();
+		$jsCondition='(!$(this).closest("tr").hasClass("'.$activeClass.'") || event.target.tagName === "TR")';
 		if (isset($parameters['jsCondition'])) {
-			$jsCondition = '(' . $parameters['jsCondition'] . ' && ' . $jsCondition . ')';
+			$jsCondition='('.$parameters['jsCondition'].' && '.$jsCondition.')';
 		}
-		$parameters = \array_merge($parameters, [
+		$parameters=\array_merge($parameters, [
 			"stopPropagation" => false,
 			"preventDefault" => false,
 			"jsCondition" => $jsCondition
 		]);
-		$selector = "tbody tr";
+		$selector="tbody tr";
 		if (isset($parameters["selector"])) {
-			$selector = $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) {
@@ -120,10 +120,10 @@ 
 		return $this->_self->getBsComponent()->getScript();
 	}
 
-	public function addEventsOnRun(JsUtils $js = NULL) {
-		$script = parent::addEventsOnRun($js);
-		$innerScript = $this->_self->getInnerScript();
-		if (! isset($innerScript)) {
+	public function addEventsOnRun(JsUtils $js=NULL) {
+		$script=parent::addEventsOnRun($js);
+		$innerScript=$this->_self->getInnerScript();
+		if (!isset($innerScript)) {
 			$this->_self->setInnerScript($script);
 		}
 		return $script;

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

Spacing +58 added lines, -58 removed lines

@@ -31,7 +31,7 @@ 
 
 	private $_activeRowSelector;
 
-	private $_focusable = false;
+	private $_focusable=false;
 
 	/**
 	 *
@@ -45,19 +45,19 @@ 
 
 	public function __construct($identifier, $rowCount, $colCount) {
 		parent::__construct($identifier, "table", "ui table");
-		$this->content = array();
+		$this->content=array();
 		$this->setRowCount($rowCount, $colCount);
-		$this->_variations = [
+		$this->_variations=[
 			Variation::CELLED,
 			Variation::PADDED,
 			Variation::COMPACT
 		];
-		$this->_compileParts = [
+		$this->_compileParts=[
 			"thead",
 			"tbody",
 			"tfoot"
 		];
-		$this->_afterCompileEvents = [];
+		$this->_afterCompileEvents=[];
 	}
 
 	/**
@@ -67,9 +67,9 @@ 
 	 * @return HtmlTableContent
 	 */
 	public function getPart($key) {
-		if (\array_key_exists($key, $this->content) === false) {
-			$this->content[$key] = new HtmlTableContent("", $key);
-			if ($key !== "tbody") {
+		if (\array_key_exists($key, $this->content)===false) {
+			$this->content[$key]=new HtmlTableContent("", $key);
+			if ($key!=="tbody") {
 				$this->content[$key]->setRowCount(1, $this->_colCount);
 			}
 		}
@@ -126,7 +126,7 @@ 
 	 * @return boolean
 	 */
 	public function hasPart($key) {
-		return \array_key_exists($key, $this->content) === true;
+		return \array_key_exists($key, $this->content)===true;
 	}
 
 	/**
@@ -136,7 +136,7 @@ 
 	 * @return HtmlTableContent
 	 */
 	public function setRowCount($rowCount, $colCount) {
-		$this->_colCount = $colCount;
+		$this->_colCount=$colCount;
 		return $this->getBody()->setRowCount($rowCount, $colCount);
 	}
 
@@ -167,8 +167,8 @@ 
 	 * @param array $values
 	 * @return HtmlTR
 	 */
-	public function addRow($values = array()) {
-		$row = $this->getBody()->addRow($this->_colCount);
+	public function addRow($values=array()) {
+		$row=$this->getBody()->addRow($this->_colCount);
 		$row->setValues(\array_values($values));
 		return $row;
 	}
@@ -189,7 +189,7 @@ 
 	 *        	values in an array of array
 	 * @return HtmlTable
 	 */
-	public function setValues($values = array()) {
+	public function setValues($values=array()) {
 		$this->getBody()->setValues($values);
 		return $this;
 	}
@@ -200,7 +200,7 @@ 
 	 * @param array $values
 	 * @return HtmlTableContent
 	 */
-	public function setHeaderValues($values = array()) {
+	public function setHeaderValues($values=array()) {
 		return $this->getHeader()->setValues($values);
 	}
 
@@ -210,7 +210,7 @@ 
 	 * @param array $values
 	 * @return HtmlTableContent
 	 */
-	public function setFooterValues($values = array()) {
+	public function setFooterValues($values=array()) {
 		return $this->getFooter()->setValues($values);
 	}
 
@@ -221,7 +221,7 @@ 
 	 * @param array $values
 	 * @return HtmlTable
 	 */
-	public function setColValues($colIndex, $values = array()) {
+	public function setColValues($colIndex, $values=array()) {
 		$this->getBody()->setColValues($colIndex, $values);
 		return $this;
 	}
@@ -233,12 +233,12 @@ 
 	 * @param array $values
 	 * @return HtmlTable
 	 */
-	public function setRowValues($rowIndex, $values = array()) {
+	public function setRowValues($rowIndex, $values=array()) {
 		$this->getBody()->setRowValues($rowIndex, $values);
 		return $this;
 	}
 
-	public function addColVariations($colIndex, $variations = array()) {
+	public function addColVariations($colIndex, $variations=array()) {
 		return $this->getBody()->addColVariations($colIndex, $variations);
 	}
 
@@ -305,19 +305,19 @@ 
 	public function setColAlignment($colIndex, $alignment) {
 		switch ($alignment) {
 			case TextAlignment::LEFT:
-				$function = "colLeft";
+				$function="colLeft";
 				break;
 
 			case TextAlignment::RIGHT:
-				$function = "colRight";
+				$function="colRight";
 				break;
 
 			case TextAlignment::CENTER:
-				$function = "colCenter";
+				$function="colCenter";
 				break;
 
 			default:
-				$function = "colLeft";
+				$function="colLeft";
 		}
 		$this->colAlign($colIndex, $function);
 		return $this;
@@ -326,19 +326,19 @@ 
 	public function setColAlignmentFromRight($colIndex, $alignment) {
 		switch ($alignment) {
 			case TextAlignment::LEFT:
-				$function = "colLeftFromRight";
+				$function="colLeftFromRight";
 				break;
 
 			case TextAlignment::RIGHT:
-				$function = "colRightFromRight";
+				$function="colRightFromRight";
 				break;
 
 			case TextAlignment::CENTER:
-				$function = "colCenterFromRight";
+				$function="colCenterFromRight";
 				break;
 
 			default:
-				$function = "colLeftFromRight";
+				$function="colLeftFromRight";
 		}
 		$this->colAlign($colIndex, $function);
 		return $this;
@@ -414,19 +414,19 @@ 
 	 *
 	 * @see HtmlSemDoubleElement::compile()
 	 */
-	public function compile(JsUtils $js = NULL, &$view = NULL) {
-		if (\sizeof($this->_compileParts) < 3) {
-			$this->_template = "%content%";
+	public function compile(JsUtils $js=NULL, &$view=NULL) {
+		if (\sizeof($this->_compileParts)<3) {
+			$this->_template="%content%";
 			$this->refresh($js);
 		}
-		$this->content = JArray::sortAssociative($this->content, $this->_compileParts);
+		$this->content=JArray::sortAssociative($this->content, $this->_compileParts);
 		return parent::compile($js, $view);
 	}
 
-	protected function compile_once(JsUtils $js = NULL, &$view = NULL) {
+	protected function compile_once(JsUtils $js=NULL, &$view=NULL) {
 		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'));");
 		}
 	}
 
@@ -437,11 +437,11 @@ 
 	 * @see BaseHtml::fromDatabaseObject()
 	 */
 	public function fromDatabaseObject($object, $function) {
-		$result = $function($object);
+		$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"]))
@@ -457,10 +457,10 @@ 
 	 *        	array of thead,tbody,tfoot
 	 * @return HtmlTable
 	 */
-	public function setCompileParts($parts = [
+	public function setCompileParts($parts=[
 		"tbody"
 	]) {
-		$this->_compileParts = $parts;
+		$this->_compileParts=$parts;
 		return $this;
 	}
 
@@ -470,22 +470,22 @@ 
 	}
 
 	public function refresh($js) {
-		$this->_footer = $this->getFooter();
+		$this->_footer=$this->getFooter();
 		if (isset($js)) {
-			$js->exec('$("#' . $this->identifier . ' tfoot").replaceWith("' . \addslashes($this->_footer) . '");', true);
+			$js->exec('$("#'.$this->identifier.' tfoot").replaceWith("'.\addslashes($this->_footer).'");', true);
 		}
 	}
 
 	public function run(JsUtils $js) {
-		if (! $this->_runned) {
+		if (!$this->_runned) {
 			if (isset($this->_activeRowSelector)) {
 				$this->_activeRowSelector->run();
 			}
 		}
-		$result = parent::run($js);
+		$result=parent::run($js);
 		if (isset($this->_footer))
 			$this->_footer->run($js);
-		$this->_runned = true;
+		$this->_runned=true;
 		return $result;
 	}
 
@@ -497,7 +497,7 @@ 
 	 * @return HtmlTable
 	 */
 	public function onNewRow($callback) {
-		$this->_afterCompileEvents["onNewRow"] = $callback;
+		$this->_afterCompileEvents["onNewRow"]=$callback;
 		return $this;
 	}
 
@@ -509,8 +509,8 @@ 
 	 * @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;
 	}
 
@@ -537,29 +537,29 @@ 
 	}
 
 	public function setColWidth($colIndex, $width) {
-		$part = $this->_getFirstPart();
-		if ($part !== null && $part->count() > 0)
+		$part=$this->_getFirstPart();
+		if ($part!==null && $part->count()>0)
 			$part->getCell(0, $colIndex)->setWidth($width);
 		return $this;
 	}
 
 	public function setColWidths($widths) {
-		$part = $this->_getFirstPart();
-		if ($part !== null && $part->count() > 0) {
-			$count = $part->getColCount();
-			if (! \is_array($widths)) {
-				$widths = \array_fill(0, $count, $widths);
+		$part=$this->_getFirstPart();
+		if ($part!==null && $part->count()>0) {
+			$count=$part->getColCount();
+			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") {
-		$body = $this->getBody();
+	public function mergeIdentiqualValues($colIndex, $function="strip_tags") {
+		$body=$this->getBody();
 		$body->mergeIdentiqualValues($colIndex, $function);
 		return $this;
 	}
@@ -577,7 +577,7 @@ 
 	 * @param mixed $_innerScript
 	 */
 	public function setInnerScript($_innerScript) {
-		$this->_innerScript = $_innerScript;
+		$this->_innerScript=$_innerScript;
 	}
 
 	public function onActiveRowChange($jsCode) {
@@ -585,7 +585,7 @@ 
 		return $this;
 	}
 
-	public function addMergeRow($colCount, $value = null) {
+	public function addMergeRow($colCount, $value=null) {
 		return $this->getBody()->addMergeRow($colCount, $value);
 	}
 

Ajax/semantic/widgets/datatable/DataTable.php

Spacing +128 added lines, -128 removed lines

@@ -25,7 +25,7 @@ 
  *
  */
 class DataTable extends Widget {
-	use TableTrait,DataTableFieldAsTrait,HasCheckboxesTrait,BaseTrait;
+	use TableTrait, DataTableFieldAsTrait, HasCheckboxesTrait, BaseTrait;
 
 	protected $_searchField;
 
@@ -41,7 +41,7 @@ 
 
 	protected $_displayBehavior;
 
-	protected $_visibleHover = false;
+	protected $_visibleHover=false;
 
 	protected $_targetSelector;
 
@@ -51,7 +51,7 @@ 
 
 	protected $_json;
 
-	protected $_rowClass = "_element";
+	protected $_rowClass="_element";
 
 	protected $_sortable;
 
@@ -65,26 +65,26 @@ 
 
 	protected $_namePrefix;
 
-	public function __construct($identifier, $model, $modelInstance = NULL) {
+	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->_urls=[];
+		$this->_emptyMessage=new HtmlMessage("", "nothing to display");
 		$this->_emptyMessage->setIcon("info circle");
 	}
 
 	public function run(JsUtils $js) {
-		if ($this->_runned !== true) {
-			$offset = $js->scriptCount();
+		if ($this->_runned!==true) {
+			$offset=$js->scriptCount();
 			if ($this->_hasCheckboxes && isset($js)) {
 				$this->_runCheckboxes($js);
 			}
 			if ($this->_visibleHover) {
-				$js->execOn("mouseover", "#" . $this->identifier . " tr", "$(event.currentTarget).closest('tr').find('.visibleover').css('visibility', 'visible');", [
+				$js->execOn("mouseover", "#".$this->identifier." tr", "$(event.currentTarget).closest('tr').find('.visibleover').css('visibility', 'visible');", [
 					"preventDefault" => false,
 					"stopPropagation" => true
 				]);
-				$js->execOn("mouseout", "#" . $this->identifier . " tr", "$(event.currentTarget).closest('tr').find('.visibleover').css('visibility', 'hidden');$(event.currentTarget).trigger('visibleoverOut');", [
+				$js->execOn("mouseout", "#".$this->identifier." tr", "$(event.currentTarget).closest('tr').find('.visibleover').css('visibility', 'hidden');$(event.currentTarget).trigger('visibleoverOut');", [
 					"preventDefault" => false,
 					"stopPropagation" => true
 				]);
@@ -101,16 +101,16 @@ 
 				$this->_associatePaginationBehavior($js, $offset);
 			}
 			$this->_associateSearchFieldBehavior($js, $offset);
-			$this->_runned = true;
+			$this->_runned=true;
 		}
 	}
 
 	protected function _generateBehavior($op, $params, JsUtils $js) {
 		if (isset($this->_urls[$op])) {
-			$params = \array_merge($params, [
+			$params=\array_merge($params, [
 				"attr" => "data-ajax"
 			]);
-			$js->ajaxOnClick("#" . $this->identifier . " ._" . $op, $this->_urls[$op], $this->getTargetSelector($op), $params);
+			$js->ajaxOnClick("#".$this->identifier." ._".$op, $this->_urls[$op], $this->getTargetSelector($op), $params);
 		}
 	}
 
@@ -129,21 +129,21 @@ 
 	}
 
 	public function refreshTD($fieldName, $jquery, $view) {
-		$index = $this->_getIndex($fieldName);
+		$index=$this->_getIndex($fieldName);
 		$this->compile($jquery, $view);
 		return $this->refreshTR()
 			->getTable()
 			->getCell(0, $index);
 	}
 
-	public function compile(JsUtils $js = NULL, &$view = NULL) {
-		if (! $this->_generated) {
+	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"];
+			$captions=$this->_instanceViewer->getCaptions();
+			$table=$this->content["table"];
 			if ($this->_hasCheckboxes) {
 				$this->_generateMainCheckbox($captions);
 			}
@@ -158,17 +158,17 @@ 
 			$this->compileExtraElements($table, $captions);
 			$this->_compileSearchFieldBehavior($js);
 
-			$this->content = JArray::sortAssociative($this->content, [
+			$this->content=JArray::sortAssociative($this->content, [
 				PositionInTable::BEFORETABLE,
 				"table",
 				PositionInTable::AFTERTABLE
 			]);
-			if ($this->_caption != null) {
+			if ($this->_caption!=null) {
 				$this->wrap("<div class='field'><label>{$this->_caption}</label>", "</div>");
 			}
 			$this->_compileForm();
 			$this->_applyStyleAttributes($table);
-			$this->_generated = true;
+			$this->_generated=true;
 		}
 		return parent::compile($js, $view);
 	}
@@ -206,9 +206,9 @@ 
 	}
 
 	protected function _generateHeader(HtmlTable $table, $captions) {
-		$gbFields = $this->_instanceViewer->getGroupByFields();
+		$gbFields=$this->_instanceViewer->getGroupByFields();
 		if (\is_array($gbFields)) {
-			$captions = \array_values(JArray::removeByKeys($captions, $gbFields));
+			$captions=\array_values(JArray::removeByKeys($captions, $gbFields));
 		}
 		$table->setHeaderValues($captions);
 		if (isset($this->_sortable)) {
@@ -217,22 +217,22 @@ 
 	}
 
 	protected function _generateContent($table) {
-		$objects = $this->_modelInstance;
+		$objects=$this->_modelInstance;
 		if (isset($this->_pagination)) {
-			$objects = $this->_pagination->getObjects($this->_modelInstance);
+			$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) {
+		$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);
 			});
 		} else {
-			$diffFields = \array_values(JArray::removeByKeys($fields, $groupByFields));
-			$activeValues = \array_combine($groupByFields, \array_fill(0, \count($groupByFields), null));
-			$uuids = [];
-			$table->fromDatabaseObjects($objects, function ($instance) use ($table, $fields, &$activeValues, $groupByFields, &$uuids, $diffFields) {
+			$diffFields=\array_values(JArray::removeByKeys($fields, $groupByFields));
+			$activeValues=\array_combine($groupByFields, \array_fill(0, \count($groupByFields), null));
+			$uuids=[];
+			$table->fromDatabaseObjects($objects, function($instance) use ($table, $fields, &$activeValues, $groupByFields, &$uuids, $diffFields) {
 				$this->_instanceViewer->setInstance($instance);
 				foreach ($groupByFields as $index => $gbField) {
 					$this->_generateGroupByRow($index, $gbField, $table, $fields, $activeValues, $uuids);
@@ -240,8 +240,8 @@ 
 				return $this->_generateRow($instance, $diffFields, $table, null, $uuids);
 			});
 		}
-		if ($table->getRowCount() == 0) {
-			$result = $table->addRow();
+		if ($table->getRowCount()==0) {
+			$result=$table->addRow();
 			$result->mergeCol();
 			$result->setValues([
 				$this->_emptyMessage
@@ -250,20 +250,20 @@ 
 	}
 
 	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) {
-				$uuids = [];
+		$newValue=$this->_instanceViewer->getValue($gbField);
+		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(\count($fields) + 1, $newValue);
-			$result->setIdentifier($this->identifier . "-tr-gb-" . $id);
+			$uuid=\uniqid("grp");
+			$uuids[$gbField]=$uuid;
+			$id=$this->_instanceViewer->getIdentifier();
+			$result=$table->addMergeRow(\count($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);
-			$activeValues[$gbField] = $newValue;
+			$activeValues[$gbField]=$newValue;
 		}
 	}
 
@@ -275,9 +275,9 @@ 
 	}
 
 	public function getFieldValue($index) {
-		$index = $this->_getIndex($index);
+		$index=$this->_getIndex($index);
 		if (\is_numeric($index)) {
-			$values = $this->_instanceViewer->getValues();
+			$values=$this->_instanceViewer->getValues();
 			if (isset($values[$index])) {
 				return $values[$index];
 			}
@@ -285,30 +285,30 @@ 
 		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();
-		$id = $this->_instanceViewer->getIdentifier();
-		$dataAjax = $id;
-		$id = $this->cleanIdentifier($id);
+		InstanceViewer::$index++;
+		$values=$this->_instanceViewer->getValues();
+		$id=$this->_instanceViewer->getIdentifier();
+		$dataAjax=$id;
+		$id=$this->cleanIdentifier($id);
 		if ($this->_hasCheckboxes) {
-			$ck = new HtmlCheckbox("ck-" . $this->identifier . "-" . $id, "");
-			$checked = false;
+			$ck=new HtmlCheckbox("ck-".$this->identifier."-".$id, "");
+			$checked=false;
 			if (isset($this->_checkedCallback)) {
-				$func = $this->_checkedCallback;
-				$checked = $func($instance);
+				$func=$this->_checkedCallback;
+				$checked=$func($instance);
 			}
 			$ck->setChecked($checked);
-			$field = $ck->getField();
+			$field=$ck->getField();
 			$field->setProperty("value", $dataAjax);
 			$field->setProperty("name", "selection[]");
 			if (isset($checkedClass))
 				$field->setClass($checkedClass);
 			\array_unshift($values, $ck);
 		}
-		$result = $table->newRow();
-		$result->setIdentifier($this->identifier . "-tr-" . $id);
+		$result=$table->newRow();
+		$result->setIdentifier($this->identifier."-tr-".$id);
 		$result->setProperty("data-ajax", $dataAjax);
 		$result->setValues($values);
 		$result->addToProperty("class", $this->_rowClass);
@@ -321,67 +321,67 @@ 
 
 	protected function _generatePagination($table) {
 		if (isset($this->_toolbar)) {
-			if ($this->_toolbarPosition == PositionInTable::FOOTER)
+			if ($this->_toolbarPosition==PositionInTable::FOOTER)
 				$this->_toolbar->setFloated("left");
 		}
-		$footer = $table->getFooter();
+		$footer=$table->getFooter();
 		$footer->mergeCol();
-		$this->_paginationToolbar = $this->_pagination->generateMenu($this->identifier);
+		$this->_paginationToolbar=$this->_pagination->generateMenu($this->identifier);
 		$footer->addValues($this->_paginationToolbar);
 	}
 
-	protected function _associatePaginationBehavior(JsUtils $js = NULL, $offset = null) {
+	protected function _associatePaginationBehavior(JsUtils $js=NULL, $offset=null) {
 		if (isset($this->_urls["refresh"])) {
-			$menu = $this->_pagination->getMenu();
+			$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(), [
+				$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");'
+					"jsCallback" => '$("#'.$this->identifier.'").trigger("pageChange");$("#'.$this->identifier.'").trigger("activeRowChange");'
 				]);
-				$page = $_POST["p"] ?? null;
+				$page=$_POST["p"] ?? null;
 				if (isset($page)) {
-					$activeClass = $this->getActiveRowClass();
-					$js->execAtLast('$("#' . $this->getIdentifier() . ' .pagination").children("a.item").removeClass("' . $activeClass . '");$("#' . $this->getIdentifier() . ' .pagination").children("a.item[data-page=' . $page . ']:not(.no-active)").addClass("' . $activeClass . '");');
+					$activeClass=$this->getActiveRowClass();
+					$js->execAtLast('$("#'.$this->getIdentifier().' .pagination").children("a.item").removeClass("'.$activeClass.'");$("#'.$this->getIdentifier().' .pagination").children("a.item[data-page='.$page.']:not(.no-active)").addClass("'.$activeClass.'");');
 				}
 			}
 		}
 	}
 
-	protected function _compileSearchFieldBehavior(JsUtils $js = NULL) {
+	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", [
+			$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()]);'
+				"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) {
-		$fieldName = parent::_getFieldName($index);
+		$fieldName=parent::_getFieldName($index);
 		if (\is_object($fieldName))
-			$fieldName = "field-" . $index;
-		if ($this->_namePrefix != null) {
-			$fieldName = $this->_namePrefix . '.' . $fieldName;
+			$fieldName="field-".$index;
+		if ($this->_namePrefix!=null) {
+			$fieldName=$this->_namePrefix.'.'.$fieldName;
 		}
-		return $fieldName . "[]";
+		return $fieldName."[]";
 	}
 
 	protected function _getFieldCaption($index) {
 		return null;
 	}
 
-	protected function applyToolbarPosition(string $position, $table, $captions = NULL) {
+	protected function applyToolbarPosition(string $position, $table, $captions=NULL) {
 		switch ($position) {
 			case PositionInTable::BEFORETABLE:
 			case PositionInTable::AFTERTABLE:
-				if (isset($this->_compileParts) === false) {
-					$this->content[$position] = $this->_toolbar;
+				if (isset($this->_compileParts)===false) {
+					$this->content[$position]=$this->_toolbar;
 				}
 				break;
 			case PositionInTable::HEADER:
@@ -392,7 +392,7 @@ 
 		}
 	}
 
-	protected function _setToolbarPosition($table, $captions = NULL) {
+	protected function _setToolbarPosition($table, $captions=NULL) {
 		if (\is_array($this->_toolbarPosition)) {
 			foreach ($this->_toolbarPosition as $tbp) {
 				$this->applyToolbarPosition($tbp, $table, $captions);
@@ -418,11 +418,11 @@ 
 	}
 
 	private function addToolbarRow($part, $table, $captions) {
-		$hasPart = $table->hasPart($part);
+		$hasPart=$table->hasPart($part);
 		if ($hasPart) {
-			$row = $table->getPart($part)->addRow(\count($captions));
+			$row=$table->getPart($part)->addRow(\count($captions));
 		} else {
-			$row = $table->getPart($part)->getRow(0);
+			$row=$table->getPart($part)->getRow(0);
 		}
 		$row->mergeCol();
 		$row->setValues([
@@ -454,12 +454,12 @@ 
 	 */
 	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);
+			$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 = [
+			$this->_urls=[
 				"refresh" => $urls,
 				"edit" => $urls,
 				"delete" => $urls,
@@ -482,8 +482,8 @@ 
 	 *        	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;
 	}
 
@@ -498,8 +498,8 @@ 
 	 *        	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;
 	}
 
@@ -508,10 +508,10 @@ 
 	 * @param array $compileParts
 	 * @return DataTable
 	 */
-	public function refresh($compileParts = [
+	public function refresh($compileParts=[
 		'tbody'
 	]) {
-		$this->_compileParts = $compileParts;
+		$this->_compileParts=$compileParts;
 		return $this;
 	}
 
@@ -521,14 +521,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...");
+		if (isset($this->_searchField)===false) {
+			$this->_searchField=new HtmlInput("search-".$this->identifier, "search", "", "Search...");
 			$this->_searchField->addIcon("search", Direction::RIGHT);
 		}
 		return $this->_searchField;
@@ -556,9 +556,9 @@ 
 	}
 
 	protected function getTargetSelector($op) {
-		$result = $this->_targetSelector;
-		if (! isset($result[$op]))
-			$result = "#" . $this->identifier;
+		$result=$this->_targetSelector;
+		if (!isset($result[$op]))
+			$result="#".$this->identifier;
 		return $result[$op];
 	}
 
@@ -570,20 +570,20 @@ 
 	 * @return DataTable
 	 */
 	public function setTargetSelector($_targetSelector) {
-		if (! \is_array($_targetSelector)) {
-			$_targetSelector = [
+		if (!\is_array($_targetSelector)) {
+			$_targetSelector=[
 				"edit" => $_targetSelector,
 				"delete" => $_targetSelector
 			];
 		}
-		$this->_targetSelector = $_targetSelector;
+		$this->_targetSelector=$_targetSelector;
 		return $this;
 	}
 
 	public function getRefreshSelector() {
 		if (isset($this->_refreshSelector))
 			return $this->_refreshSelector;
-		return "#" . $this->identifier . " tbody";
+		return "#".$this->identifier." tbody";
 	}
 
 	/**
@@ -592,7 +592,7 @@ 
 	 * @return DataTable
 	 */
 	public function setRefreshSelector($_refreshSelector) {
-		$this->_refreshSelector = $_refreshSelector;
+		$this->_refreshSelector=$_refreshSelector;
 		return $this;
 	}
 
@@ -604,9 +604,9 @@ 
 	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);
+				$modelInstance=\json_decode(\json_encode($modelInstance), FALSE);
 		}
-		$this->_modelInstance = $modelInstance;
+		$this->_modelInstance=$modelInstance;
 	}
 
 	public function getRowClass() {
@@ -620,7 +620,7 @@ 
 	 * @return DataTable
 	 */
 	public function setRowClass($_rowClass) {
-		$this->_rowClass = $_rowClass;
+		$this->_rowClass=$_rowClass;
 		return $this;
 	}
 
@@ -631,16 +631,16 @@ 
 	 * @return DataTable
 	 */
 	public function setEmptyMessage($_emptyMessage) {
-		$this->_emptyMessage = $_emptyMessage;
+		$this->_emptyMessage=$_emptyMessage;
 		return $this;
 	}
 
-	public function setSortable($colIndex = NULL) {
-		$this->_sortable = $colIndex;
+	public function setSortable($colIndex=NULL) {
+		$this->_sortable=$colIndex;
 		return $this;
 	}
 
-	public function setActiveRowSelector($class = "active", $event = "click", $multiple = false) {
+	public function setActiveRowSelector($class="active", $event="click", $multiple=false) {
 		$this->_self->setActiveRowSelector($class, $event, $multiple);
 		return $this;
 	}
@@ -654,19 +654,19 @@ 
 	}
 
 	public function hideColumn($colIndex) {
-		if (! \is_array($this->_hiddenColumns))
-			$this->_hiddenColumns = [];
-		$this->_hiddenColumns[] = $colIndex;
+		if (!\is_array($this->_hiddenColumns))
+			$this->_hiddenColumns=[];
+		$this->_hiddenColumns[]=$colIndex;
 		return $this;
 	}
 
 	public function setColWidth($colIndex, $width) {
-		$this->_colWidths[$colIndex] = $width;
+		$this->_colWidths[$colIndex]=$width;
 		return $this;
 	}
 
 	public function setColWidths($_colWidths) {
-		$this->_colWidths = $_colWidths;
+		$this->_colWidths=$_colWidths;
 		return $this;
 	}
 
@@ -675,7 +675,7 @@ 
 		return $this;
 	}
 
-	public function trigger($event, $params = "[]") {
+	public function trigger($event, $params="[]") {
 		return $this->getHtmlComponent()->trigger($event, $params);
 	}
 
@@ -713,7 +713,7 @@ 
 	 * @param mixed $_displayBehavior
 	 */
 	public function setDisplayBehavior($_displayBehavior) {
-		$this->_displayBehavior = $_displayBehavior;
+		$this->_displayBehavior=$_displayBehavior;
 	}
 
 	/**
@@ -733,8 +733,8 @@ 
 	}
 
 	public function addGroupBy($index) {
-		$index = $this->_getIndex($index);
-		if ($index !== false) {
+		$index=$this->_getIndex($index);
+		if ($index!==false) {
 			$this->_instanceViewer->addGroupBy($index);
 		}
 	}
@@ -744,7 +744,7 @@ 
 	 * @param boolean $_visibleHover
 	 */
 	public function setVisibleHover($_visibleHover) {
-		$this->_visibleHover = $_visibleHover;
+		$this->_visibleHover=$_visibleHover;
 	}
 
 	/**
@@ -755,7 +755,7 @@ 
 		return $this->_paginationToolbar;
 	}
 
-	public function setInverted($recursive = true) {
+	public function setInverted($recursive=true) {
 		$this->getHtmlComponent()->setInverted($recursive);
 		if ($this->_emptyMessage instanceof HtmlSemDoubleElement) {
 			$this->_emptyMessage->setInverted($recursive);
@@ -767,7 +767,7 @@ 
 	}
 
 	public function setFormCaption($caption) {
-		$this->_caption = $caption;
+		$this->_caption=$caption;
 	}
 
 	/**
@@ -783,6 +783,6 @@ 
 	 * @param mixed $namePrefix
 	 */
 	public function setNamePrefix($namePrefix): void {
-		$this->_namePrefix = $namePrefix;
+		$this->_namePrefix=$namePrefix;
 	}
 }

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

Spacing +99 added lines, -99 removed lines

@@ -15,15 +15,15 @@ 
  */
 class HtmlTableContent extends HtmlSemCollection {
 
-	protected $_focusable = false;
+	protected $_focusable=false;
 
-	protected $_tdTagNames = [
+	protected $_tdTagNames=[
 		"thead" => "th",
 		"tbody" => "td",
 		"tfoot" => "th"
 	];
 
-	protected $_merged = false;
+	protected $_merged=false;
 
 	/**
 	 *
@@ -32,7 +32,7 @@ 
 	 * @param int $rowCount
 	 * @param int $colCount
 	 */
-	public function __construct($identifier, $tagName = "tbody", $rowCount = NULL, $colCount = NULL) {
+	public function __construct($identifier, $tagName="tbody", $rowCount=NULL, $colCount=NULL) {
 		parent::__construct($identifier, $tagName, "");
 		if (isset($rowCount) && isset($colCount))
 			$this->setRowCount($rowCount, $colCount);
@@ -45,8 +45,8 @@ 
 	 * @return HtmlTableContent
 	 */
 	public function setRowCount($rowCount, $colCount) {
-		$count = $this->count();
-		for ($i = $count; $i < $rowCount; $i ++) {
+		$count=$this->count();
+		for ($i=$count; $i<$rowCount; $i++) {
 			$this->addItem($colCount);
 		}
 		return $this;
@@ -57,7 +57,7 @@ 
 	}
 
 	public function refreshTR() {
-		$this->_template = "%wrapContentBefore%%content%%wrapContentAfter%";
+		$this->_template="%wrapContentBefore%%content%%wrapContentAfter%";
 	}
 
 	/**
@@ -68,14 +68,14 @@ 
 	 * @return HtmlTR
 	 */
 	protected function createItem($value) {
-		$count = $this->count();
-		$tr = new HtmlTR("");
+		$count=$this->count();
+		$tr=new HtmlTR("");
 		$tr->setContainer($this, $count);
 		if ($this->_focusable) {
 			$tr->setProperty('tabindex', $count);
 		}
 		$tr->setTdTagName($this->_tdTagNames[$this->tagName]);
-		if (isset($value) === true) {
+		if (isset($value)===true) {
 			$tr->setColCount($value);
 		}
 		return $tr;
@@ -103,8 +103,8 @@ 
 		return $this->addItem($row);
 	}
 
-	public function addMergeRow($colCount, $value = null) {
-		$row = $this->addRow($colCount);
+	public function addMergeRow($colCount, $value=null) {
+		$row=$this->addRow($colCount);
 		$row->mergeCol();
 		if (isset($value)) {
 			$row->setValues([
@@ -130,11 +130,11 @@ 
 	 * @return HtmlTD|HtmlDoubleElement
 	 */
 	public function getCell($row, $col) {
-		$row = $this->getItem($row);
+		$row=$this->getItem($row);
 		if (isset($row) && $row instanceof HtmlCollection) {
-			$col = $row->getItem($col);
+			$col=$row->getItem($col);
 		} else {
-			$col = $row;
+			$col=$row;
 		}
 		return $col;
 	}
@@ -155,9 +155,9 @@ 
 	 * @param mixed $value
 	 * @return HtmlTableContent
 	 */
-	public function setCellValue($row, $col, $value = "") {
-		$cell = $this->getCell($row, $col);
-		if (isset($cell) === true) {
+	public function setCellValue($row, $col, $value="") {
+		$cell=$this->getCell($row, $col);
+		if (isset($cell)===true) {
 			$cell->setValue($value);
 		}
 		return $this;
@@ -168,8 +168,8 @@ 
 	 *
 	 * @param mixed $values
 	 */
-	public function setValues($values = array()) {
-		return $this->_addOrSetValues($values, function (HtmlTR $row, $_values) {
+	public function setValues($values=array()) {
+		return $this->_addOrSetValues($values, function(HtmlTR $row, $_values) {
 			$row->setValues($_values);
 		});
 	}
@@ -179,8 +179,8 @@ 
 	 *
 	 * @param mixed $values
 	 */
-	public function addValues($values = array()) {
-		return $this->_addOrSetValues($values, function (HtmlTR $row, $_values) {
+	public function addValues($values=array()) {
+		return $this->_addOrSetValues($values, function(HtmlTR $row, $_values) {
 			$row->addValues($_values);
 		});
 	}
@@ -192,42 +192,42 @@ 
 	 * @param callable $callback
 	 */
 	protected function _addOrSetValues($values, $callback) {
-		$count = $this->count();
-		$isArray = true;
-		if (! \is_array($values)) {
-			$values = \array_fill(0, $count, $values);
-			$isArray = false;
+		$count=$this->count();
+		$isArray=true;
+		if (!\is_array($values)) {
+			$values=\array_fill(0, $count, $values);
+			$isArray=false;
 		}
-		if (JArray::dimension($values) == 1 && $isArray)
-			$values = [
+		if (JArray::dimension($values)==1 && $isArray)
+			$values=[
 				$values
 			];
 
-		$count = \min(\sizeof($values), $count);
+		$count=\min(\sizeof($values), $count);
 
-		for ($i = 0; $i < $count; $i ++) {
-			$row = $this->content[$i];
+		for ($i=0; $i<$count; $i++) {
+			$row=$this->content[$i];
 			$callback($row, $values[$i]);
 		}
 		return $this;
 	}
 
-	public function setColValues($colIndex, $values = array()) {
-		$count = $this->count();
-		if (! \is_array($values)) {
-			$values = \array_fill(0, $count, $values);
+	public function setColValues($colIndex, $values=array()) {
+		$count=$this->count();
+		if (!\is_array($values)) {
+			$values=\array_fill(0, $count, $values);
 		}
-		$count = \min(\sizeof($values), $count);
-		for ($i = 0; $i < $count; $i ++) {
+		$count=\min(\sizeof($values), $count);
+		for ($i=0; $i<$count; $i++) {
 			$this->getCell($i, $colIndex)->setValue($values[$i]);
 		}
 		return $this;
 	}
 
-	public function addColVariations($colIndex, $variations = array()) {
-		$count = $this->count();
-		for ($i = 0; $i < $count; $i ++) {
-			$cell = $this->getCell($i, $colIndex);
+	public function addColVariations($colIndex, $variations=array()) {
+		$count=$this->count();
+		for ($i=0; $i<$count; $i++) {
+			$cell=$this->getCell($i, $colIndex);
 			if ($cell instanceof BaseTrait)
 				$cell->addVariations($variations);
 		}
@@ -235,31 +235,31 @@ 
 	}
 
 	public function addPropertyCol($colIndex, $name, $value) {
-		$count = $this->count();
-		for ($i = 0; $i < $count; $i ++) {
-			$cell = $this->getCell($i, $colIndex);
+		$count=$this->count();
+		for ($i=0; $i<$count; $i++) {
+			$cell=$this->getCell($i, $colIndex);
 			if (isset($cell))
 				$cell->addToProperty($name, $value);
 		}
 		return $this;
 	}
 
-	public function setRowValues($rowIndex, $values = array()) {
-		$count = $this->count();
-		if (! \is_array($values)) {
-			$values = \array_fill(0, $count, $values);
+	public function setRowValues($rowIndex, $values=array()) {
+		$count=$this->count();
+		if (!\is_array($values)) {
+			$values=\array_fill(0, $count, $values);
 		}
 		$this->getItem($rowIndex)->setValues($values);
 		return $this;
 	}
 
 	private function colAlign($colIndex, $function) {
-		$count = $this->count();
-		for ($i = 0; $i < $count; $i ++) {
-			$index = $this->content[$i]->getColPosition($colIndex);
-			if ($index !== NULL) {
-				$cell = $this->getCell($i, $index);
-				if ($cell != NULL) {
+		$count=$this->count();
+		for ($i=0; $i<$count; $i++) {
+			$index=$this->content[$i]->getColPosition($colIndex);
+			if ($index!==NULL) {
+				$cell=$this->getCell($i, $index);
+				if ($cell!=NULL) {
 					$cell->$function();
 				}
 			}
@@ -268,12 +268,12 @@ 
 	}
 
 	private function colAlignFromRight($colIndex, $function) {
-		$count = $this->count();
-		for ($i = 0; $i < $count; $i ++) {
-			$maxRow = $this->content[$i]->count();
-			$index = $maxRow - $colIndex - 1;
-			if (($cell = $this->getCell($i, $index)) !== NULL) {
-				if ($cell->getColspan() == 1)
+		$count=$this->count();
+		for ($i=0; $i<$count; $i++) {
+			$maxRow=$this->content[$i]->count();
+			$index=$maxRow-$colIndex-1;
+			if (($cell=$this->getCell($i, $index))!==NULL) {
+				if ($cell->getColspan()==1)
 					$cell->$function();
 			}
 		}
@@ -319,9 +319,9 @@ 
 	 * @return int
 	 */
 	public function getColCount() {
-		$result = 0;
-		if ($this->count() > 0)
-			$result = $this->getItem(0)->count();
+		$result=0;
+		if ($this->count()>0)
+			$result=$this->getItem(0)->count();
 		return $result;
 	}
 
@@ -332,10 +332,10 @@ 
 	 * @param int $colIndex
 	 * @return HtmlTableContent
 	 */
-	public function delete($rowIndex, $colIndex = NULL) {
+	public function delete($rowIndex, $colIndex=NULL) {
 		if (isset($colIndex)) {
-			$row = $this->getItem($rowIndex);
-			if (isset($row) === true) {
+			$row=$this->getItem($rowIndex);
+			if (isset($row)===true) {
 				$row->delete($colIndex);
 			}
 		} else {
@@ -345,24 +345,24 @@ 
 	}
 
 	public function toDelete($rowIndex, $colIndex) {
-		$row = $this->getItem($rowIndex);
-		if (isset($row) === true)
+		$row=$this->getItem($rowIndex);
+		if (isset($row)===true)
 			$row->toDelete($colIndex);
 		return $this;
 	}
 
 	public function toRowspanned($rowIndex, $colIndex) {
-		$row = $this->getItem($rowIndex);
-		if (isset($row) === true)
+		$row=$this->getItem($rowIndex);
+		if (isset($row)===true)
 			$row->toRowspanned($colIndex);
 		return $this;
 	}
 
-	public function mergeCol($rowIndex = 0, $colIndex = 0) {
+	public function mergeCol($rowIndex=0, $colIndex=0) {
 		return $this->getItem($rowIndex)->mergeCol($colIndex);
 	}
 
-	public function mergeRow($rowIndex = 0, $colIndex = 0) {
+	public function mergeRow($rowIndex=0, $colIndex=0) {
 		return $this->getItem($rowIndex)->mergeRow($colIndex);
 	}
 
@@ -382,7 +382,7 @@ 
 	 * @return HtmlTableContent
 	 */
 	public function conditionalCellFormat($callback, $format) {
-		$rows = $this->content;
+		$rows=$this->content;
 		foreach ($rows as $row) {
 			$row->conditionalCellFormat($callback, $format);
 		}
@@ -390,9 +390,9 @@ 
 	}
 
 	public function conditionalColFormat($colIndex, $callback, $format) {
-		$rows = $this->content;
+		$rows=$this->content;
 		foreach ($rows as $row) {
-			$cell = $row->getItem($colIndex);
+			$cell=$row->getItem($colIndex);
 			$cell->conditionnalCellFormat($callback, $format);
 		}
 		return $this;
@@ -405,7 +405,7 @@ 
 	 * @return HtmlTableContent
 	 */
 	public function conditionalRowFormat($callback, $format) {
-		$rows = $this->content;
+		$rows=$this->content;
 		foreach ($rows as $row) {
 			$row->conditionalRowFormat($callback, $format);
 		}
@@ -413,9 +413,9 @@ 
 	}
 
 	public function hideColumn($colIndex) {
-		$rows = $this->content;
+		$rows=$this->content;
 		foreach ($rows as $row) {
-			$cell = $row->getItem($colIndex);
+			$cell=$row->getItem($colIndex);
 			$cell->addToProperty("style", "display:none;");
 		}
 		return $this;
@@ -427,7 +427,7 @@ 
 	 * @return HtmlTableContent
 	 */
 	public function applyCells($callback) {
-		$rows = $this->content;
+		$rows=$this->content;
 		foreach ($rows as $row) {
 			$row->applyCells($callback);
 		}
@@ -440,7 +440,7 @@ 
 	 * @return HtmlTableContent
 	 */
 	public function applyRows($callback) {
-		$rows = $this->content;
+		$rows=$this->content;
 		foreach ($rows as $row) {
 			$row->apply($callback);
 		}
@@ -455,28 +455,28 @@ 
 	 * @see https://fomantic-ui.com/collections/table.html#definition needs rowspanned class
 	 * @since fomantic-ui 2.4.8
 	 */
-	public function mergeIdentiqualValues($colIndex, $function = "strip_tags") {
-		$rows = $this->content;
-		$identiqual = null;
-		$counter = 0;
-		$cellToMerge = null;
-		$functionExists = \function_exists($function);
+	public function mergeIdentiqualValues($colIndex, $function="strip_tags") {
+		$rows=$this->content;
+		$identiqual=null;
+		$counter=0;
+		$cellToMerge=null;
+		$functionExists=\function_exists($function);
 		foreach ($rows as $row) {
-			$cell = $row->getItem($colIndex);
-			$value = $cell->getContent();
+			$cell=$row->getItem($colIndex);
+			$value=$cell->getContent();
 			if ($functionExists)
-				$value = \call_user_func($function, $value);
-			if ($value !== $identiqual) {
-				if ($counter > 0 && isset($cellToMerge)) {
+				$value=\call_user_func($function, $value);
+			if ($value!==$identiqual) {
+				if ($counter>0 && isset($cellToMerge)) {
 					$cellToMerge->setRowspanned($counter);
 				}
-				$counter = 0;
-				$cellToMerge = $cell;
-				$identiqual = $value;
+				$counter=0;
+				$cellToMerge=$cell;
+				$identiqual=$value;
 			}
-			$counter ++;
+			$counter++;
 		}
-		if ($counter > 0 && isset($cellToMerge)) {
+		if ($counter>0 && isset($cellToMerge)) {
 			$cellToMerge->setRowspanned($counter);
 		}
 		return $this;
@@ -487,7 +487,7 @@ 
 	}
 
 	public function _setMerged($value) {
-		$this->_merged = $value;
+		$this->_merged=$value;
 		return $this;
 	}
 
@@ -496,6 +496,6 @@ 
 	 * @param bool $focusable
 	 */
 	public function setFocusable(bool $focusable): void {
-		$this->_focusable = $focusable;
+		$this->_focusable=$focusable;
 	}
 }

Ajax/semantic/html/collections/form/HtmlFormInput.php

Spacing +20 added lines, -20 removed lines

@@ -7,23 +7,23 @@ 
 class HtmlFormInput extends HtmlFormField {
 	use TextFieldsTrait;
 
-	const TOGGLE_CLICK = 0;
+	const TOGGLE_CLICK=0;
 
-	const TOGGLE_MOUSEDOWN = 1;
+	const TOGGLE_MOUSEDOWN=1;
 
-	const TOGGLE_INTERVAL = 2;
+	const TOGGLE_INTERVAL=2;
 
-	public function __construct($identifier, $label = NULL, $type = "text", $value = NULL, $placeholder = NULL) {
-		if (! isset($placeholder) && $type === "text")
-			$placeholder = $label;
-		parent::__construct("field-" . $identifier, new HtmlInput($identifier, $type, $value, $placeholder), $label);
-		$this->_identifier = $identifier;
+	public function __construct($identifier, $label=NULL, $type="text", $value=NULL, $placeholder=NULL) {
+		if (!isset($placeholder) && $type==="text")
+			$placeholder=$label;
+		parent::__construct("field-".$identifier, new HtmlInput($identifier, $type, $value, $placeholder), $label);
+		$this->_identifier=$identifier;
 	}
 
 	public function getDataField() {
-		$field = $this->getField();
+		$field=$this->getField();
 		if ($field instanceof HtmlInput)
-			$field = $field->getDataField();
+			$field=$field->getDataField();
 		return $field;
 	}
 
@@ -32,9 +32,9 @@ 
 	 *
 	 * @param string $keyIcon
 	 */
-	public function asPassword($keyIcon = 'key') {
+	public function asPassword($keyIcon='key') {
 		$this->setInputType('password');
-		if ($keyIcon != '') {
+		if ($keyIcon!='') {
 			$this->addIcon($keyIcon);
 		}
 	}
@@ -49,28 +49,28 @@ 
 	 *        	one of TOGGLE_CLICK, TOGGLE_MOUSEDOWN, TOGGLE_INTERVAL
 	 * @return mixed|\Ajax\semantic\html\elements\HtmlButton
 	 */
-	public function addTogglePasswordAction($buttonIcon = 'eye', $keyIcon = 'key', $slashIcon = 'slash', $type = 0) {
+	public function addTogglePasswordAction($buttonIcon='eye', $keyIcon='key', $slashIcon='slash', $type=0) {
 		$this->asPassword($keyIcon);
-		$action = $this->addAction('see');
+		$action=$this->addAction('see');
 		$action->asIcon($buttonIcon);
 		switch ($type) {
 			case self::TOGGLE_CLICK:
-				$action->onClick('let th=$(this);' . $this->getJsToggle($slashIcon, '(_,attr)=>(attr=="text")?"password":"text"', 'toggle'));
+				$action->onClick('let th=$(this);'.$this->getJsToggle($slashIcon, '(_,attr)=>(attr=="text")?"password":"text"', 'toggle'));
 				break;
 			case self::TOGGLE_MOUSEDOWN:
 				$action->onClick('');
-				$action->addEvent('mousedown', 'let th=$(this);' . $this->getJsToggle($slashIcon, '"text"', 'add'));
-				$action->addEvent('mouseup', 'let th=$(this);' . $this->getJsToggle($slashIcon, '"password"', 'remove'));
-				$action->addEvent('mouseout', 'let th=$(this);' . $this->getJsToggle($slashIcon, '"password"', 'remove'));
+				$action->addEvent('mousedown', 'let th=$(this);'.$this->getJsToggle($slashIcon, '"text"', 'add'));
+				$action->addEvent('mouseup', 'let th=$(this);'.$this->getJsToggle($slashIcon, '"password"', 'remove'));
+				$action->addEvent('mouseout', 'let th=$(this);'.$this->getJsToggle($slashIcon, '"password"', 'remove'));
 				break;
 			case self::TOGGLE_INTERVAL:
-				$action->onClick('let th=$(this);' . $this->getJsToggle($slashIcon, '"text"', 'add') . 'setTimeout(function(){ ' . $this->getJsToggle($slashIcon, '"password"', 'remove') . ' }, 5000);');
+				$action->onClick('let th=$(this);'.$this->getJsToggle($slashIcon, '"text"', 'add').'setTimeout(function(){ '.$this->getJsToggle($slashIcon, '"password"', 'remove').' }, 5000);');
 				break;
 		}
 		return $action;
 	}
 
 	private function getJsToggle($slashIcon, $type, $actionClass) {
-		return 'th.find(".icon").' . $actionClass . 'Class("' . $slashIcon . '");th.closest(".field").find("input").attr("type",' . $type . ');';
+		return 'th.find(".icon").'.$actionClass.'Class("'.$slashIcon.'");th.closest(".field").find("input").attr("type",'.$type.');';
 	}
 }

Ajax/semantic/components/validation/FieldValidation.php

Spacing +19 added lines, -19 removed lines

@@ -30,7 +30,7 @@ 
 	 */
 	protected $customRules;
 
-	protected $hasCustomRules = false;
+	protected $hasCustomRules=false;
 
 	/**
 	 *
@@ -41,8 +41,8 @@ 
 	protected $optional;
 
 	public function __construct($identifier) {
-		$this->identifier = $identifier;
-		$this->rules = [];
+		$this->identifier=$identifier;
+		$this->rules=[];
 	}
 
 	public function getIdentifier() {
@@ -50,7 +50,7 @@ 
 	}
 
 	public function setIdentifier($identifier) {
-		$this->identifier = $identifier;
+		$this->identifier=$identifier;
 		return $this;
 	}
 
@@ -65,47 +65,47 @@ 
 	 * @param string $value
 	 * @return Rule
 	 */
-	public function addRule($type, $prompt = NULL, $value = NULL) {
+	public function addRule($type, $prompt=NULL, $value=NULL) {
 		if ($type instanceof Rule) {
-			$rule = $type;
+			$rule=$type;
 			if ($type instanceof CustomRule) {
-				$this->customRules[] = $type;
-				$this->hasCustomRules = true;
+				$this->customRules[]=$type;
+				$this->hasCustomRules=true;
 			}
 		} elseif (\is_array($type)) {
-			$value = JArray::getValue($type, "value", 2);
-			$prompt = JArray::getValue($type, "prompt", 1);
-			$type = JArray::getValue($type, "type", 0);
-			$rule = new Rule($type, $prompt, $value);
+			$value=JArray::getValue($type, "value", 2);
+			$prompt=JArray::getValue($type, "prompt", 1);
+			$type=JArray::getValue($type, "type", 0);
+			$rule=new Rule($type, $prompt, $value);
 		} else {
-			$rule = new Rule($type, $prompt, $value);
+			$rule=new Rule($type, $prompt, $value);
 		}
-		$this->rules[] = $rule;
+		$this->rules[]=$rule;
 		return $rule;
 	}
 
 	#[\ReturnTypeWillChange]
 	public function jsonSerialize() {
-		$result = [
+		$result=[
 			"identifier" => $this->identifier,
 			"rules" => $this->rules
 		];
 		if ($this->optional) {
-			$result["optional"] = true;
+			$result["optional"]=true;
 		}
 		if (isset($this->depends)) {
-			$result["depends"] = $this->depends;
+			$result["depends"]=$this->depends;
 		}
 		return $result;
 	}
 
 	public function setDepends($depends) {
-		$this->depends = $depends;
+		$this->depends=$depends;
 		return $this;
 	}
 
 	public function setOptional($optional) {
-		$this->optional = $optional;
+		$this->optional=$optional;
 		return $this;
 	}