phpMv / phpMv-UI

Ajax/common/traits/JsUtilsEventsTrait.php

Spacing +28 added lines, -28 removed lines

@@ -10,7 +10,7 @@ 
  */
 trait JsUtilsEventsTrait {
 
-	protected $jquery_events = array(
+	protected $jquery_events=array(
 		"bind",
 		"blur",
 		"change",
@@ -51,7 +51,7 @@ 
 		"unload"
 	);
 
-	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);
 
 	/**
 	 * Outputs a javascript library blur event
@@ -62,7 +62,7 @@ 
 	 *        	code to execute
 	 * @return string
 	 */
-	public function blur($element = 'this', $js = '') {
+	public function blur($element='this', $js='') {
 		return $this->_add_event($element, $js, 'blur');
 	}
 
@@ -77,7 +77,7 @@ 
 	 * @param boolean $stopPropagation
 	 * @return string
 	 */
-	public function change($element = 'this', $js = '', $preventDefault = false, $stopPropagation = false) {
+	public function change($element='this', $js='', $preventDefault=false, $stopPropagation=false) {
 		return $this->_add_event($element, $js, 'change', $preventDefault, $stopPropagation);
 	}
 
@@ -94,15 +94,15 @@ 
 	 * @param boolean $stopPropagation
 	 * @return string
 	 */
-	public function click($element = 'this', $js = '', $ret_false = TRUE, $preventDefault = false, $stopPropagation = false) {
-		if (! is_array($js)) {
-			$js = array(
+	public function click($element='this', $js='', $ret_false=TRUE, $preventDefault=false, $stopPropagation=false) {
+		if (!is_array($js)) {
+			$js=array(
 				$js
 			);
 		}
 
 		if ($ret_false) {
-			$js[] = "return false;";
+			$js[]="return false;";
 		}
 
 		return $this->_add_event($element, $js, 'click', $preventDefault, $stopPropagation);
@@ -117,7 +117,7 @@ 
 	 *        	code to execute
 	 * @return string
 	 */
-	public function contextmenu($element = 'this', $js = '') {
+	public function contextmenu($element='this', $js='') {
 		return $this->_add_event($element, $js, 'contextmenu');
 	}
 
@@ -130,7 +130,7 @@ 
 	 *        	code to execute
 	 * @return string
 	 */
-	public function dblclick($element = 'this', $js = '') {
+	public function dblclick($element='this', $js='') {
 		return $this->_add_event($element, $js, 'dblclick');
 	}
 
@@ -143,7 +143,7 @@ 
 	 *        	code to execute
 	 * @return string
 	 */
-	public function error($element = 'this', $js = '') {
+	public function error($element='this', $js='') {
 		return $this->_add_event($element, $js, 'error');
 	}
 
@@ -156,7 +156,7 @@ 
 	 *        	code to execute
 	 * @return string
 	 */
-	public function focus($element = 'this', $js = '') {
+	public function focus($element='this', $js='') {
 		return $this->_add_event($element, $js, 'focus');
 	}
 
@@ -170,9 +170,9 @@ 
 	 *        	code for mouse out
 	 * @return string
 	 */
-	public function hover($element = 'this', $over, $out) {
-		$event = "\n\t$(" . Javascript::prep_element($element) . ").hover(\n\t\tfunction()\n\t\t{\n\t\t\t{$over}\n\t\t}, \n\t\tfunction()\n\t\t{\n\t\t\t{$out}\n\t\t});\n";
-		$this->jquery_code_for_compile[] = $event;
+	public function hover($element='this', $over, $out) {
+		$event="\n\t$(".Javascript::prep_element($element).").hover(\n\t\tfunction()\n\t\t{\n\t\t\t{$over}\n\t\t}, \n\t\tfunction()\n\t\t{\n\t\t\t{$out}\n\t\t});\n";
+		$this->jquery_code_for_compile[]=$event;
 		return $event;
 	}
 
@@ -185,7 +185,7 @@ 
 	 *        	code to execute
 	 * @return string
 	 */
-	public function keydown($element = 'this', $js = '') {
+	public function keydown($element='this', $js='') {
 		return $this->_add_event($element, $js, 'keydown');
 	}
 
@@ -198,7 +198,7 @@ 
 	 *        	code to execute
 	 * @return string
 	 */
-	public function keypress($element = 'this', $js = '') {
+	public function keypress($element='this', $js='') {
 		return $this->_add_event($element, $js, 'keypress');
 	}
 
@@ -211,7 +211,7 @@ 
 	 *        	code to execute
 	 * @return string
 	 */
-	public function keyup($element = 'this', $js = '') {
+	public function keyup($element='this', $js='') {
 		return $this->_add_event($element, $js, 'keyup');
 	}
 
@@ -224,7 +224,7 @@ 
 	 *        	code to execute
 	 * @return string
 	 */
-	public function load($element = 'this', $js = '') {
+	public function load($element='this', $js='') {
 		return $this->_add_event($element, $js, 'load');
 	}
 
@@ -237,7 +237,7 @@ 
 	 *        	code to execute
 	 * @return string
 	 */
-	public function mousedown($element = 'this', $js = '') {
+	public function mousedown($element='this', $js='') {
 		return $this->_add_event($element, $js, 'mousedown');
 	}
 
@@ -250,7 +250,7 @@ 
 	 *        	code to execute
 	 * @return string
 	 */
-	public function mouseout($element = 'this', $js = '', $preventDefault = false, $stopPropagation = false) {
+	public function mouseout($element='this', $js='', $preventDefault=false, $stopPropagation=false) {
 		return $this->_add_event($element, $js, 'mouseout', $preventDefault, $stopPropagation);
 	}
 
@@ -263,7 +263,7 @@ 
 	 *        	code to execute
 	 * @return string
 	 */
-	public function mouseleave($element = 'this', $js = '', $preventDefault = false, $stopPropagation = false) {
+	public function mouseleave($element='this', $js='', $preventDefault=false, $stopPropagation=false) {
 		return $this->_add_event($element, $js, 'mouseleave', $preventDefault, $stopPropagation);
 	}
 
@@ -276,7 +276,7 @@ 
 	 *        	code to execute
 	 * @return string
 	 */
-	public function mouseenter($element = 'this', $js = '', $preventDefault = false, $stopPropagation = false) {
+	public function mouseenter($element='this', $js='', $preventDefault=false, $stopPropagation=false) {
 		return $this->_add_event($element, $js, 'mouseenter', $preventDefault, $stopPropagation);
 	}
 
@@ -289,7 +289,7 @@ 
 	 *        	code to execute
 	 * @return string
 	 */
-	public function mouseover($element = 'this', $js = '') {
+	public function mouseover($element='this', $js='') {
 		return $this->_add_event($element, $js, 'mouseover');
 	}
 
@@ -302,7 +302,7 @@ 
 	 *        	code to execute
 	 * @return string
 	 */
-	public function mouseup($element = 'this', $js = '') {
+	public function mouseup($element='this', $js='') {
 		return $this->_add_event($element, $js, 'mouseup');
 	}
 
@@ -315,7 +315,7 @@ 
 	 *        	code to execute
 	 * @return string
 	 */
-	public function unload($element = 'this', $js = '') {
+	public function unload($element='this', $js='') {
 		return $this->_add_event($element, $js, 'unload');
 	}
 
@@ -329,7 +329,7 @@ 
 	 *        	code to execute
 	 * @return string
 	 */
-	public function resize($element = 'this', $js = '') {
+	public function resize($element='this', $js='') {
 		return $this->_add_event($element, $js, 'resize');
 	}
 
@@ -343,7 +343,7 @@ 
 	 *        	code to execute
 	 * @return string
 	 */
-	public function scroll($element = 'this', $js = '') {
+	public function scroll($element='this', $js='') {
 		return $this->_add_event($element, $js, 'scroll');
 	}
 }

Ajax/semantic/components/Dimmer.php

Spacing +5 added lines, -5 removed lines

@@ -7,18 +7,18 @@
 
 	public function __construct(JsUtils $js) {
 		parent::__construct($js);
-		$this->uiName = "dimmer";
+		$this->uiName="dimmer";
 	}
 
-	public function setOn($value = false) {
-		$this->params["on"] = $value;
+	public function setOn($value=false) {
+		$this->params["on"]=$value;
 	}
 
 	public function setOpacity($value) {
-		$this->params["opacity"] = $value;
+		$this->params["opacity"]=$value;
 	}
 
 	public function setClosable($value) {
-		$this->params["closable"] = $value;
+		$this->params["closable"]=$value;
 	}
 }

Ajax/semantic/html/modules/HtmlDimmer.php

Spacing +14 added lines, -14 removed lines

@@ -12,21 +12,21 @@ 
 
 	private $_inverted;
 
-	public function __construct($identifier, $content = NULL) {
+	public function __construct($identifier, $content=NULL) {
 		parent::__construct($identifier, "div", "ui dimmer");
 		$this->setContent($content);
-		$this->_inverted = false;
+		$this->_inverted=false;
 	}
 
 	public function setContent($content) {
-		$this->content = new HtmlSemDoubleElement("content-" . $this->identifier, "div", "content", new HtmlSemDoubleElement("", "div", "center", $content));
+		$this->content=new HtmlSemDoubleElement("content-".$this->identifier, "div", "content", new HtmlSemDoubleElement("", "div", "center", $content));
 		return $this;
 	}
 
-	public function asIcon($icon, $title, $subHeader = NULL) {
-		$header = new HtmlHeader("header-" . $this->identifier);
+	public function asIcon($icon, $title, $subHeader=NULL) {
+		$header=new HtmlHeader("header-".$this->identifier);
 		$header->asIcon($icon, $title, $subHeader);
-		if ($this->_inverted === false)
+		if ($this->_inverted===false)
 			$header->setInverted();
 		return $this->setContent($header);
 	}
@@ -35,24 +35,24 @@ 
 		return $this->addToProperty("class", "page");
 	}
 
-	public function setInverted($recursive = true) {
+	public function setInverted($recursive=true) {
 		parent::setInverted($recursive);
-		$this->_inverted = true;
+		$this->_inverted=true;
 		return $this;
 	}
 
 	public function run(JsUtils $js) {
 		if ($this->_container instanceof HtmlSingleElement) {
-			$this->_bsComponent = $js->semantic()->dimmer("#" . $this->_container->getIdentifier(), $this->_params);
+			$this->_bsComponent=$js->semantic()->dimmer("#".$this->_container->getIdentifier(), $this->_params);
 		} else {
-			$this->_bsComponent = $js->semantic()->dimmer("#" . $this->identifier, $this->_params);
+			$this->_bsComponent=$js->semantic()->dimmer("#".$this->identifier, $this->_params);
 		}
 		return parent::run($js);
 	}
 
 	public function jsShow() {
 		if (isset($this->_container))
-			return '$("#.' . $this->_container->getIdentifier() . ').dimmer("show");';
+			return '$("#.'.$this->_container->getIdentifier().').dimmer("show");';
 	}
 
 	public function setBlurring() {
@@ -60,17 +60,17 @@ 
 	}
 
 	public function setParams($_params) {
-		$this->_params = $_params;
+		$this->_params=$_params;
 		return $this;
 	}
 
 	public function setContainer($_container) {
-		$this->_container = $_container;
+		$this->_container=$_container;
 		return $this;
 	}
 
 	public function setClosable($closable) {
-		$this->_params['closable'] = $closable;
+		$this->_params['closable']=$closable;
 		return $this;
 	}
 }

Ajax/semantic/html/collections/HtmlMessage.php

Spacing +19 added lines, -19 removed lines

@@ -16,15 +16,15 @@ 
  * @version 1.001
  */
 class HtmlMessage extends HtmlSemDoubleElement {
-	use AttachedTrait,HasTimeoutTrait;
+	use AttachedTrait, HasTimeoutTrait;
 
 	protected $icon;
 
 	protected $close;
 
-	public function __construct($identifier, $content = "") {
+	public function __construct($identifier, $content="") {
 		parent::__construct($identifier, "div");
-		$this->_template = '<%tagName% id="%identifier%" %properties%>%close%%icon%%wrapContentBefore%%content%%wrapContentAfter%</%tagName%>';
+		$this->_template='<%tagName% id="%identifier%" %properties%>%close%%icon%%wrapContentBefore%%content%%wrapContentAfter%</%tagName%>';
 		$this->setClass("ui message");
 		$this->setContent($content);
 	}
@@ -36,9 +36,9 @@ 
 	 * @return \Ajax\semantic\html\collections\HtmlMessage
 	 */
 	public function addHeader($header) {
-		$headerO = $header;
+		$headerO=$header;
 		if (\is_string($header)) {
-			$headerO = new HtmlSemDoubleElement("header-" . $this->identifier, "div");
+			$headerO=new HtmlSemDoubleElement("header-".$this->identifier, "div");
 			$headerO->setClass("header");
 			$headerO->setContent($header);
 		}
@@ -53,9 +53,9 @@ 
 		$this->addToProperty("class", "icon");
 		$this->wrapContent("<div class='content'>", "</div>");
 		if (\is_string($icon)) {
-			$this->icon = new HtmlIcon("icon-" . $this->identifier, $icon);
+			$this->icon=new HtmlIcon("icon-".$this->identifier, $icon);
 		} else {
-			$this->icon = $icon;
+			$this->icon=$icon;
 		}
 		return $this;
 	}
@@ -72,23 +72,23 @@ 
 	 *        	default : array("preventDefault"=>true,"stopPropagation"=>true,"params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>null,"headers"=>null,"historize"=>false)
 	 * @return $this
 	 */
-	public function getOnClose($url, $responseElement = "", $parameters = array()) {
+	public function getOnClose($url, $responseElement="", $parameters=array()) {
 		if (isset($this->close)) {
 			$this->close->getOnClick($url, $responseElement, $parameters);
 		}
 	}
 
-	public function addLoader($loaderIcon = "notched circle") {
+	public function addLoader($loaderIcon="notched circle") {
 		$this->setIcon($loaderIcon);
 		$this->icon->addToIcon("loading");
 		return $this;
 	}
 
-	public function setDismissable($dismiss = true) {
-		if ($dismiss === true)
-			$this->close = new HtmlIcon("close-" . $this->identifier, "close");
+	public function setDismissable($dismiss=true) {
+		if ($dismiss===true)
+			$this->close=new HtmlIcon("close-".$this->identifier, "close");
 		else
-			$this->close = NULL;
+			$this->close=NULL;
 		return $this;
 	}
 
@@ -98,9 +98,9 @@ 
 	 * @see \Ajax\semantic\html\base\HtmlSemDoubleElement::run()
 	 */
 	public function run(JsUtils $js) {
-		if (! isset($this->_bsComponent)) {
+		if (!isset($this->_bsComponent)) {
 			if (isset($this->close)) {
-				$js->execOn("click", "#" . $this->identifier . " .close", "$(this).closest('.message').transition({$this->_closeTransition})");
+				$js->execOn("click", "#".$this->identifier." .close", "$(this).closest('.message').transition({$this->_closeTransition})");
 			}
 			if (isset($this->_timeout)) {
 				$js->exec("setTimeout(function() { $('#{$this->identifier}').transition({$this->_closeTransition}); }, {$this->_timeout});", true);
@@ -109,15 +109,15 @@ 
 		return parent::run($js);
 	}
 
-	public function setState($visible = true) {
-		$visible = ($visible === true) ? "visible" : "hidden";
+	public function setState($visible=true) {
+		$visible=($visible===true) ? "visible" : "hidden";
 		return $this->addToPropertyCtrl("class", $visible, array(
 			"visible",
 			"hidden"
 		));
 	}
 
-	public function setVariation($value = "floating") {
+	public function setVariation($value="floating") {
 		return $this->addToPropertyCtrl("class", $value, array(
 			"floating",
 			"compact"
@@ -138,7 +138,7 @@ 
 
 	public function setMessage($message) {
 		if (\is_array($this->content)) {
-			$this->content[\sizeof($this->content) - 1] = $message;
+			$this->content[\sizeof($this->content)-1]=$message;
 		} else
 			$this->setContent($message);
 	}

Ajax/common/traits/JsUtilsActionsTrait.php

Spacing +138 added lines, -138 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
@@ -27,15 +27,15 @@ 
 	 *        	defers the execution if set to false
 	 * @return string
 	 */
-	protected function _showHideWithEffect($action, $element = 'this', $speed = '', $callback = '', $immediatly = false) {
-		$element = Javascript::prep_element($element);
-		$speed = $this->_validate_speed($speed);
-		if ($callback != '') {
-			$callback = ", function(){\n{$callback}\n}";
+	protected function _showHideWithEffect($action, $element='this', $speed='', $callback='', $immediatly=false) {
+		$element=Javascript::prep_element($element);
+		$speed=$this->_validate_speed($speed);
+		if ($callback!='') {
+			$callback=", function(){\n{$callback}\n}";
 		}
-		$str = "$({$element}).{$action}({$speed}{$callback});";
+		$str="$({$element}).{$action}({$speed}{$callback});";
 		if ($immediatly)
-			$this->jquery_code_for_compile[] = $str;
+			$this->jquery_code_for_compile[]=$str;
 		return $str;
 	}
 
@@ -51,9 +51,9 @@ 
 			'normal',
 			'fast'
 		))) {
-			$speed = '"' . $speed . '"';
+			$speed='"'.$speed.'"';
 		} elseif (preg_match("/[^0-9]/", $speed)) {
-			$speed = '';
+			$speed='';
 		}
 
 		return $speed;
@@ -68,15 +68,15 @@ 
 	 * @param boolean $immediatly
 	 *        	delayed if false
 	 */
-	public function _genericCallValue($jQueryCall, $element = 'this', $param = "", $immediatly = false) {
-		$element = Javascript::prep_element($element);
+	public function _genericCallValue($jQueryCall, $element='this', $param="", $immediatly=false) {
+		$element=Javascript::prep_element($element);
 		if (isset($param)) {
-			$param = Javascript::prep_value($param);
-			$str = "$({$element}).{$jQueryCall}({$param});";
+			$param=Javascript::prep_value($param);
+			$str="$({$element}).{$jQueryCall}({$param});";
 		} else
-			$str = "$({$element}).{$jQueryCall}();";
+			$str="$({$element}).{$jQueryCall}();";
 		if ($immediatly)
-			$this->jquery_code_for_compile[] = $str;
+			$this->jquery_code_for_compile[]=$str;
 		return $str;
 	}
 
@@ -90,12 +90,12 @@ 
 	 *        	delayed if false
 	 * @return string
 	 */
-	public function _genericCallElement($jQueryCall, $to = 'this', $element, $immediatly = false) {
-		$to = Javascript::prep_element($to);
-		$element = Javascript::prep_element($element);
-		$str = "$({$to}).{$jQueryCall}({$element});";
+	public function _genericCallElement($jQueryCall, $to='this', $element, $immediatly=false) {
+		$to=Javascript::prep_element($to);
+		$element=Javascript::prep_element($element);
+		$str="$({$to}).{$jQueryCall}({$element});";
 		if ($immediatly)
-			$this->jquery_code_for_compile[] = $str;
+			$this->jquery_code_for_compile[]=$str;
 		return $str;
 	}
 
@@ -109,7 +109,7 @@ 
 	 *        	defers the execution if set to false
 	 * @return string
 	 */
-	public function addClass($element = 'this', $class = '', $immediatly = false) {
+	public function addClass($element='this', $class='', $immediatly=false) {
 		return $this->_genericCallValue('addClass', $element, $class, $immediatly);
 	}
 
@@ -122,7 +122,7 @@ 
 	 *        	defers the execution if set to false
 	 * @return string
 	 */
-	public function after($to, $element, $immediatly = false) {
+	public function after($to, $element, $immediatly=false) {
 		return $this->_genericCallElement('after', $to, $element, $immediatly);
 	}
 
@@ -135,7 +135,7 @@ 
 	 *        	defers the execution if set to false
 	 * @return string
 	 */
-	public function before($to, $element, $immediatly = false) {
+	public function before($to, $element, $immediatly=false) {
 		return $this->_genericCallElement('before', $to, $element, $immediatly);
 	}
 
@@ -148,15 +148,15 @@ 
 	 * @param boolean $immediatly
 	 *        	delayed if false
 	 */
-	public function attr($element = 'this', $attributeName, $value = "", $immediatly = false) {
-		$element = Javascript::prep_element($element);
+	public function attr($element='this', $attributeName, $value="", $immediatly=false) {
+		$element=Javascript::prep_element($element);
 		if (isset($value)) {
-			$value = Javascript::prep_value($value);
-			$str = "$({$element}).attr(\"$attributeName\",{$value});";
+			$value=Javascript::prep_value($value);
+			$str="$({$element}).attr(\"$attributeName\",{$value});";
 		} else
-			$str = "$({$element}).attr(\"$attributeName\");";
+			$str="$({$element}).attr(\"$attributeName\");";
 		if ($immediatly)
-			$this->jquery_code_for_compile[] = $str;
+			$this->jquery_code_for_compile[]=$str;
 		return $str;
 	}
 
@@ -168,7 +168,7 @@ 
 	 * @param boolean $immediatly
 	 *        	defers the execution if set to false
 	 */
-	public function val($element = 'this', $value = '', $immediatly = false) {
+	public function val($element='this', $value='', $immediatly=false) {
 		return $this->_genericCallValue('val', $element, $value, $immediatly);
 	}
 
@@ -180,7 +180,7 @@ 
 	 * @param boolean $immediatly
 	 *        	defers the execution if set to false
 	 */
-	public function html($element = 'this', $value = '', $immediatly = false) {
+	public function html($element='this', $value='', $immediatly=false) {
 		return $this->_genericCallValue('html', $element, $value, $immediatly);
 	}
 
@@ -197,30 +197,30 @@ 
 	 *        	defers the execution if set to false
 	 * @return string
 	 */
-	public function animate($element = 'this', $params = array(), $speed = '', $extra = '', $immediatly = false) {
-		$element = Javascript::prep_element($element);
-		$speed = $this->_validate_speed($speed);
+	public function animate($element='this', $params=array(), $speed='', $extra='', $immediatly=false) {
+		$element=Javascript::prep_element($element);
+		$speed=$this->_validate_speed($speed);
 
-		$animations = "\t\t\t";
+		$animations="\t\t\t";
 		if (\is_array($params)) {
 			foreach ($params as $param => $value) {
-				$animations .= $param . ': \'' . $value . '\', ';
+				$animations.=$param.': \''.$value.'\', ';
 			}
 		}
-		$animations = substr($animations, 0, - 2); // remove the last ", "
+		$animations=substr($animations, 0, - 2); // remove the last ", "
 
-		if ($speed != '') {
-			$speed = ', ' . $speed;
+		if ($speed!='') {
+			$speed=', '.$speed;
 		}
 
-		if ($extra != '') {
-			$extra = ', ' . $extra;
+		if ($extra!='') {
+			$extra=', '.$extra;
 		}
 
-		$str = "$({$element}).animate({\n$animations\n\t\t}" . $speed . $extra . ");";
+		$str="$({$element}).animate({\n$animations\n\t\t}".$speed.$extra.");";
 
 		if ($immediatly)
-			$this->jquery_code_for_compile[] = $str;
+			$this->jquery_code_for_compile[]=$str;
 		return $str;
 	}
 
@@ -233,7 +233,7 @@ 
 	 *        	defers the execution if set to false
 	 * @return string
 	 */
-	public function append($to, $element, $immediatly = false) {
+	public function append($to, $element, $immediatly=false) {
 		return $this->_genericCallElement('append', $to, $element, $immediatly);
 	}
 
@@ -246,7 +246,7 @@ 
 	 *        	defers the execution if set to false
 	 * @return string
 	 */
-	public function prepend($to, $element, $immediatly = false) {
+	public function prepend($to, $element, $immediatly=false) {
 		return $this->_genericCallElement('prepend', $to, $element, $immediatly);
 	}
 
@@ -263,7 +263,7 @@ 
 	 *        	defers the execution if set to false
 	 * @return string
 	 */
-	public function fadeIn($element = 'this', $speed = '', $callback = '', $immediatly = false) {
+	public function fadeIn($element='this', $speed='', $callback='', $immediatly=false) {
 		return $this->_showHideWithEffect("fadeIn", $element, $speed, $callback, $immediatly);
 	}
 
@@ -280,7 +280,7 @@ 
 	 *        	defers the execution if set to false
 	 * @return string
 	 */
-	public function fadeOut($element = 'this', $speed = '', $callback = '', $immediatly = false) {
+	public function fadeOut($element='this', $speed='', $callback='', $immediatly=false) {
 		return $this->_showHideWithEffect("fadeOut", $element, $speed, $callback, $immediatly);
 	}
 
@@ -297,7 +297,7 @@ 
 	 *        	defers the execution if set to false
 	 * @return string
 	 */
-	public function slideUp($element = 'this', $speed = '', $callback = '', $immediatly = false) {
+	public function slideUp($element='this', $speed='', $callback='', $immediatly=false) {
 		return $this->_showHideWithEffect("slideUp", $element, $speed, $callback, $immediatly);
 	}
 
@@ -312,7 +312,7 @@ 
 	 *        	defers the execution if set to false
 	 * @return string
 	 */
-	public function removeClass($element = 'this', $class = '', $immediatly = false) {
+	public function removeClass($element='this', $class='', $immediatly=false) {
 		return $this->_genericCallValue('removeClass', $element, $class, $immediatly);
 	}
 
@@ -329,7 +329,7 @@ 
 	 *        	defers the execution if set to false
 	 * @return string
 	 */
-	public function slideDown($element = 'this', $speed = '', $callback = '', $immediatly = false) {
+	public function slideDown($element='this', $speed='', $callback='', $immediatly=false) {
 		return $this->_showHideWithEffect("slideDown", $element, $speed, $callback, $immediatly);
 	}
 
@@ -346,7 +346,7 @@ 
 	 *        	defers the execution if set to false
 	 * @return string
 	 */
-	public function slideToggle($element = 'this', $speed = '', $callback = '', $immediatly = false) {
+	public function slideToggle($element='this', $speed='', $callback='', $immediatly=false) {
 		return $this->_showHideWithEffect("slideToggle", $element, $speed, $callback, $immediatly);
 	}
 
@@ -363,7 +363,7 @@ 
 	 *        	defers the execution if set to false
 	 * @return string
 	 */
-	public function hide($element = 'this', $speed = '', $callback = '', $immediatly = false) {
+	public function hide($element='this', $speed='', $callback='', $immediatly=false) {
 		return $this->_showHideWithEffect("hide", $element, $speed, $callback, $immediatly);
 	}
 
@@ -380,7 +380,7 @@ 
 	 *        	defers the execution if set to false
 	 * @return string
 	 */
-	public function toggle($element = 'this', $speed = '', $callback = '', $immediatly = false) {
+	public function toggle($element='this', $speed='', $callback='', $immediatly=false) {
 		return $this->_showHideWithEffect("toggle", $element, $speed, $callback, $immediatly);
 	}
 
@@ -394,7 +394,7 @@ 
 	 *        	defers the execution if set to false
 	 * @return string
 	 */
-	public function toggleClass($element = 'this', $class = '', $immediatly = false) {
+	public function toggleClass($element='this', $class='', $immediatly=false) {
 		return $this->_genericCallValue('toggleClass', $element, $class, $immediatly);
 	}
 
@@ -406,12 +406,12 @@ 
 	 * @param boolean $immediatly
 	 *        	defers the execution if set to false
 	 */
-	public function trigger($element = 'this', $event = 'click', $immediatly = false) {
-		$element = Javascript::prep_element($element);
-		$str = "$({$element}).trigger(\"$event\");";
+	public function trigger($element='this', $event='click', $immediatly=false) {
+		$element=Javascript::prep_element($element);
+		$str="$({$element}).trigger(\"$event\");";
 
 		if ($immediatly)
-			$this->jquery_code_for_compile[] = $str;
+			$this->jquery_code_for_compile[]=$str;
 		return $str;
 	}
 
@@ -428,7 +428,7 @@ 
 	 *        	defers the execution if set to false
 	 * @return string
 	 */
-	public function show($element = 'this', $speed = '', $callback = '', $immediatly = false) {
+	public function show($element='this', $speed='', $callback='', $immediatly=false) {
 		return $this->_showHideWithEffect("show", $element, $speed, $callback, $immediatly);
 	}
 
@@ -439,18 +439,18 @@ 
 	 * @param array $options
 	 * @return string
 	 */
-	public function sortable($element, $options = array()) {
-		if (count($options) > 0) {
-			$sort_options = array();
+	public function sortable($element, $options=array()) {
+		if (count($options)>0) {
+			$sort_options=array();
 			foreach ($options as $k => $v) {
-				$sort_options[] = "\n\t\t" . $k . ': ' . $v . "";
+				$sort_options[]="\n\t\t".$k.': '.$v."";
 			}
-			$sort_options = implode(",", $sort_options);
+			$sort_options=implode(",", $sort_options);
 		} else {
-			$sort_options = '';
+			$sort_options='';
 		}
 
-		return "$(" . Javascript::prep_element($element) . ").sortable({" . $sort_options . "\n\t});";
+		return "$(".Javascript::prep_element($element).").sortable({".$sort_options."\n\t});";
 	}
 
 	/**
@@ -462,8 +462,8 @@ 
 	 *        	plugin location
 	 * @return string
 	 */
-	public function tablesorter($table = '', $options = '') {
-		$this->jquery_code_for_compile[] = "\t$(" . Javascript::prep_element($table) . ").tablesorter($options);\n";
+	public function tablesorter($table='', $options='') {
+		$this->jquery_code_for_compile[]="\t$(".Javascript::prep_element($table).").tablesorter($options);\n";
 	}
 
 	/**
@@ -475,14 +475,14 @@ 
 	 * @param boolean $immediatly
 	 *        	defers the execution if set to false
 	 */
-	public function condition($condition, $jsCodeIfTrue, $jsCodeIfFalse = null, $immediatly = false) {
-		$str = "if(" . $condition . "){" . $jsCodeIfTrue . "}";
+	public function condition($condition, $jsCodeIfTrue, $jsCodeIfFalse=null, $immediatly=false) {
+		$str="if(".$condition."){".$jsCodeIfTrue."}";
 		if (isset($jsCodeIfFalse)) {
-			$str .= "else{" . $jsCodeIfFalse . "}";
+			$str.="else{".$jsCodeIfFalse."}";
 		}
 
 		if ($immediatly)
-			$this->jquery_code_for_compile[] = $str;
+			$this->jquery_code_for_compile[]=$str;
 		return $str;
 	}
 
@@ -497,14 +497,14 @@ 
 	 * @param boolean $immediatly
 	 * @return string
 	 */
-	private function _doJQuery($element, $jqueryCall, $param = "", $jsCallback = "", $immediatly = false) {
-		$param = Javascript::prep_value($param);
-		$callback = "";
-		if ($jsCallback != "")
-			$callback = ", function(event){\n{$jsCallback}\n}";
-		$script = "$(" . Javascript::prep_element($element) . ")." . $jqueryCall . "(" . $param . $callback . ");\n";
+	private function _doJQuery($element, $jqueryCall, $param="", $jsCallback="", $immediatly=false) {
+		$param=Javascript::prep_value($param);
+		$callback="";
+		if ($jsCallback!="")
+			$callback=", function(event){\n{$jsCallback}\n}";
+		$script="$(".Javascript::prep_element($element).").".$jqueryCall."(".$param.$callback.");\n";
 		if ($immediatly)
-			$this->jquery_code_for_compile[] = $script;
+			$this->jquery_code_for_compile[]=$script;
 		return $script;
 	}
 
@@ -521,7 +521,7 @@ 
 	 *        	javascript code to execute after the jquery call
 	 * @return mixed
 	 */
-	public function doJQuery($element, $jqueryCall, $param = "", $jsCallback = "") {
+	public function doJQuery($element, $jqueryCall, $param="", $jsCallback="") {
 		return $this->_doJQuery($element, $jqueryCall, $param, $jsCallback, true);
 	}
 
@@ -538,7 +538,7 @@ 
 	 *        	javascript code to execute after the jquery call
 	 * @return mixed
 	 */
-	public function doJQueryDeferred($element, $jqueryCall, $param = "", $jsCallback = "") {
+	public function doJQueryDeferred($element, $jqueryCall, $param="", $jsCallback="") {
 		return $this->_doJQuery($element, $jqueryCall, $param, $jsCallback, false);
 	}
 
@@ -556,7 +556,7 @@ 
 	 * @param boolean $immediatly
 	 * @return string
 	 */
-	private function _doJQueryOn($event, $element, $elementToModify, $jqueryCall, $param = "", $preventDefault = false, $stopPropagation = false, $jsCallback = "", $immediatly = true) {
+	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);
 	}
 
@@ -571,11 +571,11 @@ 
 	 * @param array $parameters
 	 *        	default : array("preventDefault"=>false,"stopPropagation"=>false,"jsCallback"=>'',"immediatly"=>true)
 	 */
-	public function doJQueryOn($event, $element, $elementToModify, $jqueryCall, $param = "", $parameters = array()) {
-		$jsCallback = "";
-		$stopPropagation = false;
-		$preventDefault = false;
-		$immediatly = true;
+	public function doJQueryOn($event, $element, $elementToModify, $jqueryCall, $param="", $parameters=array()) {
+		$jsCallback="";
+		$stopPropagation=false;
+		$preventDefault=false;
+		$immediatly=true;
 		extract($parameters);
 		return $this->_doJQueryOn($event, $element, $elementToModify, $jqueryCall, $param, $preventDefault, $stopPropagation, $jsCallback, $immediatly);
 	}
@@ -589,10 +589,10 @@ 
 	 *        	delayed if false
 	 * @return String
 	 */
-	public function exec($js, $immediatly = false) {
-		$script = $js . "\n";
+	public function exec($js, $immediatly=false) {
+		$script=$js."\n";
 		if ($immediatly)
-			$this->jquery_code_for_compile[] = $script;
+			$this->jquery_code_for_compile[]=$script;
 		return $script;
 	}
 
@@ -606,8 +606,8 @@ 
 	 * @return String
 	 */
 	public function execAtLast($js) {
-		$script = $js . "\n";
-		$this->jquery_code_for_compile_at_last[] = $script;
+		$script=$js."\n";
+		$this->jquery_code_for_compile_at_last[]=$script;
 		return $script;
 	}
 
@@ -622,18 +622,18 @@ 
 	 *        	default : array("preventDefault"=>false,"stopPropagation"=>false,"immediatly"=>true)
 	 * @return String
 	 */
-	public function execOn($event, $element, $js, $parameters = array()) {
-		$stopPropagation = false;
-		$preventDefault = false;
-		$immediatly = true;
+	public function execOn($event, $element, $js, $parameters=array()) {
+		$stopPropagation=false;
+		$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;
 	}
 
-	public function setJsonToElement($json, $elementClass = "_element", $immediatly = true) {
-		$retour = "var data={$json};" . "\n\tdata=($.isPlainObject(data))?data:JSON.parse(data);" . "\n\tvar pk=data['pk'];var object=data['object'];" . "\n\tfor(var field in object){" . "\n\tif($('[data-field='+field+']',$('._element[data-ajax='+pk+']')).length){" . "\n\t\t$('[data-field='+field+']',$('._element[data-ajax='+pk+']')).each(function(){" . "\n\t\t\tif($(this).is('[value]')) { $(this).val(object[field]);} else { $(this).html(object[field]); }" . "\n\t});" . "\n}};\n";
-		$retour .= "\t$(document).trigger('jsonReady',[data]);\n";
+	public function setJsonToElement($json, $elementClass="_element", $immediatly=true) {
+		$retour="var data={$json};"."\n\tdata=($.isPlainObject(data))?data:JSON.parse(data);"."\n\tvar pk=data['pk'];var object=data['object'];"."\n\tfor(var field in object){"."\n\tif($('[data-field='+field+']',$('._element[data-ajax='+pk+']')).length){"."\n\t\t$('[data-field='+field+']',$('._element[data-ajax='+pk+']')).each(function(){"."\n\t\t\tif($(this).is('[value]')) { $(this).val(object[field]);} else { $(this).html(object[field]); }"."\n\t});"."\n}};\n";
+		$retour.="\t$(document).trigger('jsonReady',[data]);\n";
 		return $this->exec($retour, $immediatly);
 	}
 
@@ -645,13 +645,13 @@ 
 	 * @param array $parameters
 	 *        	default : array("attr"=>"id","preventDefault"=>false,"stopPropagation"=>false,"immediatly"=>true)
 	 */
-	public function setDraggable($element, $parameters = []) {
-		$attr = "id";
-		$preventDefault = false;
-		$stopPropagation = false;
-		$immediatly = true;
+	public function setDraggable($element, $parameters=[]) {
+		$attr="id";
+		$preventDefault=false;
+		$stopPropagation=false;
+		$immediatly=true;
 		extract($parameters);
-		$script = $this->_add_event($element, Javascript::draggable($attr), "dragstart", $preventDefault, $stopPropagation, $immediatly);
+		$script=$this->_add_event($element, Javascript::draggable($attr), "dragstart", $preventDefault, $stopPropagation, $immediatly);
 		return $script;
 	}
 
@@ -665,13 +665,13 @@ 
 	 * @param string $jsCallback
 	 *        	the js script to call when element is dropped
 	 */
-	public function asDropZone($element, $jsCallback = "", $parameters = []) {
-		$stopPropagation = false;
-		$immediatly = true;
-		$jqueryDone = "append";
-		$script = $this->_add_event($element, '', "dragover", true, $stopPropagation, $immediatly);
+	public function asDropZone($element, $jsCallback="", $parameters=[]) {
+		$stopPropagation=false;
+		$immediatly=true;
+		$jqueryDone="append";
+		$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;
 	}
 
@@ -688,14 +688,14 @@ 
 	 *        	delayed if false
 	 * @return string
 	 */
-	public function interval($jsCode, $time, $globalName = null, $immediatly = true) {
-		if (! Javascript::isFunction($jsCode)) {
-			$jsCode = "function(){\n" . $jsCode . "\n}";
+	public function interval($jsCode, $time, $globalName=null, $immediatly=true) {
+		if (!Javascript::isFunction($jsCode)) {
+			$jsCode="function(){\n".$jsCode."\n}";
 		}
 		if (isset($globalName)) {
-			$script = "if(window.{$globalName}){clearInterval(window.{$globalName});}\nwindow.{$globalName}=setInterval({$jsCode},{$time});";
+			$script="if(window.{$globalName}){clearInterval(window.{$globalName});}\nwindow.{$globalName}=setInterval({$jsCode},{$time});";
 		} else {
-			$script = "setInterval({$jsCode},{$time});";
+			$script="setInterval({$jsCode},{$time});";
 		}
 		return $this->exec($script, $immediatly);
 	}
@@ -709,7 +709,7 @@ 
 	 *        	delayed if false
 	 * @return string
 	 */
-	public function clearInterval($globalName, $immediatly = true) {
+	public function clearInterval($globalName, $immediatly=true) {
 		return $this->exec("if(window.{$globalName}){clearInterval(window.{$globalName});}", $immediatly);
 	}
 
@@ -731,20 +731,20 @@ 
 	 *        	delayed if false
 	 * @return string
 	 */
-	public function counter($counterSelector, $value = 0, $limit = 0, $globalName = null, $countDown = true, $immediatly = true) {
-		$stop = "";
+	public function counter($counterSelector, $value=0, $limit=0, $globalName=null, $countDown=true, $immediatly=true) {
+		$stop="";
 		if ($countDown) {
-			$stop = "if (--timer < " . $limit . ") {clearInterval(interval);display.trigger({type:'counter-end',value: timer,limit:" . $limit . "});}";
+			$stop="if (--timer < ".$limit.") {clearInterval(interval);display.trigger({type:'counter-end',value: timer,limit:".$limit."});}";
 		} else {
-			if ($limit != 0) {
-				$stop = "if (++timer > " . $limit . ") {clearInterval(interval);display.trigger({type:'counter-end',value: timer,limit:" . $limit . "});}";
+			if ($limit!=0) {
+				$stop="if (++timer > ".$limit.") {clearInterval(interval);display.trigger({type:'counter-end',value: timer,limit:".$limit."});}";
 			}
 		}
-		$global = "";
+		$global="";
 		if (isset($globalName)) {
-			$global = "\nwindow.{$globalName}=interval;";
+			$global="\nwindow.{$globalName}=interval;";
 		}
-		$timer = "var startTimer=function(duration, display) {var timer = duration, days, hours, minutes, seconds;
+		$timer="var startTimer=function(duration, display) {var timer = duration, days, hours, minutes, seconds;
 											var sh=function(disp,v){if(disp.is('[value]')){disp.val(v);} else {disp.html(v);};};
 											var shHide=function(v,k,kBefore){if(v==0 && display.find(k).closest('.timer').is(':visible') && (!kBefore || !display.find(kBefore).closest('.timer').is(':visible'))){display.find(k).closest('.timer').hide();}else{sh(display.find(k),v);}};
 											var pl=function(v,text){return (v>1)?v+' '+text+'s':(v>0)?v+' '+text:'';};
@@ -760,12 +760,12 @@ 
 												minutes = d0(parseInt((timer%3600) / 60, 10));
 												seconds = d0(parseInt(timer%60, 10));
 												mainSh(days,hours,minutes,seconds);
-												" . $stop . "
+												" . $stop."
     										}, 1000);
-										" . $global . "
+										" . $global."
 										}";
-		$element = '$("' . $counterSelector . '")';
-		return $this->exec($timer . "\nstartTimer(" . $value . "," . $element . ");", $immediatly);
+		$element='$("'.$counterSelector.'")';
+		return $this->exec($timer."\nstartTimer(".$value.",".$element.");", $immediatly);
 	}
 
 	/**
@@ -787,7 +787,7 @@ 
 	 *        	count down if true or elapse if false
 	 * @return string
 	 */
-	public function counterOn($element, $event, $counterSelector, $value = 0, $limit = 0, $globalName = null, $countDown = true) {
+	public function counterOn($element, $event, $counterSelector, $value=0, $limit=0, $globalName=null, $countDown=true) {
 		return $this->execOn($event, $element, $this->counter($counterSelector, $value, $limit, $globalName, $countDown, false));
 	}
 
@@ -802,7 +802,7 @@ 
 	 *        	the active href (if null, window.location.href is used)
 	 * @return string
 	 */
-	public function activateLink($target, $property = 'href', $href = null) {
+	public function activateLink($target, $property='href', $href=null) {
 		return $this->execAtLast($this->_activateLink($target, $property, $href));
 	}
 
@@ -817,14 +817,14 @@ 
 	 *        	the active href (if null, window.location.href is used)
 	 * @return string
 	 */
-	public function _activateLink($target, $property = 'href', $href = null) {
-		$js = '$("' . $target . ' [' . $property . ']").removeClass("active");';
+	public function _activateLink($target, $property='href', $href=null) {
+		$js='$("'.$target.' ['.$property.']").removeClass("active");';
 		if (isset($href)) {
-			$js .= 'var href="' . $href . '";';
+			$js.='var href="'.$href.'";';
 		} else {
-			$js .= 'var href=window.location.href;';
+			$js.='var href=window.location.href;';
 		}
-		$js .= '$("' . $target . ' [' . $property . ']").each(function(){if(href.includes($(this).attr("' . $property . '"))) $(this).addClass("active");});';
+		$js.='$("'.$target.' ['.$property.']").each(function(){if(href.includes($(this).attr("'.$property.'"))) $(this).addClass("active");});';
 		return $js;
 	}
 }

Ajax/semantic/widgets/base/InstanceViewer.php

Spacing +107 added lines, -107 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,26 +116,26 @@ 
 	}
 
 	protected function _getValue($property, $index) {
-		$value = null;
-		$propertyName = $property;
+		$value=null;
+		$propertyName=$property;
 		if ($property instanceof \ReflectionProperty) {
-			$value = $this->_getPropertyValue($property);
-			$propertyName = $property->getName();
+			$value=$this->_getPropertyValue($property);
+			$propertyName=$property->getName();
 		} elseif (\is_callable($property) && array_search($property, [
 			"system"
-		]) === false)
-			$value = $property($this->instance);
+		])===false)
+			$value=$property($this->instance);
 		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, []);
 			}
 		}
 
@@ -144,9 +144,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])) {
@@ -156,7 +156,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
@@ -170,29 +170,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
 					];
@@ -204,19 +204,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;
 	}
 
@@ -233,30 +233,30 @@ 
 	}
 
 	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)) {
-			$instance = new $instance();
+			$instance=new $instance();
 		}
-		$this->instance = $instance;
-		$this->properties = [];
-		$this->reflect = new \ReflectionClass($instance);
-		if (JArray::count($this->visibleProperties) === 0) {
-			$this->properties = $this->getDefaultProperties();
+		$this->instance=$instance;
+		$this->properties=[];
+		$this->reflect=new \ReflectionClass($instance);
+		if (JArray::count($this->visibleProperties)===0) {
+			$this->properties=$this->getDefaultProperties();
 		} else {
 			foreach ($this->visibleProperties as $property) {
 				$this->setInstanceProperty($property);
@@ -267,56 +267,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() {
@@ -336,43 +336,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;
 	}
 
@@ -387,7 +387,7 @@ 
 	 * @return InstanceViewer
 	 */
 	public function afterCompile($index, $callback) {
-		$this->afterCompile[$index] = $callback;
+		$this->afterCompile[$index]=$callback;
 		return $this;
 	}
 
@@ -399,7 +399,7 @@ 
 	 * @return \Ajax\semantic\widgets\base\InstanceViewer
 	 */
 	public function setCaptionCallback($captionCallback) {
-		$this->captionCallback = $captionCallback;
+		$this->captionCallback=$captionCallback;
 		return $this;
 	}
 
@@ -411,7 +411,7 @@ 
 	 * @return \Ajax\semantic\widgets\base\InstanceViewer
 	 */
 	public function setDefaultValueFunction($defaultValueFunction) {
-		$this->defaultValueFunction = $defaultValueFunction;
+		$this->defaultValueFunction=$defaultValueFunction;
 		return $this;
 	}
 
@@ -420,8 +420,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));
 		});
 	}
 
@@ -446,7 +446,7 @@ 
 	 * @param mixed $groupByFields
 	 */
 	public function setGroupByFields($groupByFields) {
-		$this->groupByFields = $groupByFields;
+		$this->groupByFields=$groupByFields;
 	}
 
 	public function getGroupByFieldsCount() {

Ajax/semantic/widgets/datatable/DataTable.php

Spacing +111 added lines, -111 removed lines

@@ -24,7 +24,7 @@ 
  *       
  */
 class DataTable extends Widget {
-	use TableTrait,DataTableFieldAsTrait,HasCheckboxesTrait,BaseTrait;
+	use TableTrait, DataTableFieldAsTrait, HasCheckboxesTrait, BaseTrait;
 
 	protected $_searchField;
 
@@ -40,7 +40,7 @@ 
 
 	protected $_displayBehavior;
 
-	protected $_visibleHover = false;
+	protected $_visibleHover=false;
 
 	protected $_targetSelector;
 
@@ -50,7 +50,7 @@ 
 
 	protected $_json;
 
-	protected $_rowClass = "_element";
+	protected $_rowClass="_element";
 
 	protected $_sortable;
 
@@ -58,25 +58,25 @@ 
 
 	protected $_colWidths;
 
-	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) {
-		$offset = $js->scriptCount();
+		$offset=$js->scriptCount();
 		if ($this->_hasCheckboxes && isset($js)) {
 			$this->_runCheckboxes($js);
 		}
 		if ($this->_visibleHover) {
-			$js->execOn("mouseover", "#" . $this->identifier . " tr", "$(event.target).closest('tr').find('.visibleover').css('visibility', 'visible');", [
+			$js->execOn("mouseover", "#".$this->identifier." tr", "$(event.target).closest('tr').find('.visibleover').css('visibility', 'visible');", [
 				"preventDefault" => false,
 				"stopPropagation" => true
 			]);
-			$js->execOn("mouseout", "#" . $this->identifier . " tr", "$(event.target).closest('tr').find('.visibleover').css('visibility', 'hidden');", [
+			$js->execOn("mouseout", "#".$this->identifier." tr", "$(event.target).closest('tr').find('.visibleover').css('visibility', 'hidden');", [
 				"preventDefault" => false,
 				"stopPropagation" => true
 			]);
@@ -96,10 +96,10 @@ 
 
 	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);
 		}
 	}
 
@@ -118,21 +118,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);
 			}
@@ -147,14 +147,14 @@ 
 			$this->compileExtraElements($table, $captions);
 			$this->_compileSearchFieldBehavior($js);
 
-			$this->content = JArray::sortAssociative($this->content, [
+			$this->content=JArray::sortAssociative($this->content, [
 				PositionInTable::BEFORETABLE,
 				"table",
 				PositionInTable::AFTERTABLE
 			]);
 			$this->_compileForm();
 			$this->_applyStyleAttributes($table);
-			$this->_generated = true;
+			$this->_generated=true;
 		}
 		return parent::compile($js, $view);
 	}
@@ -199,21 +199,21 @@ 
 	}
 
 	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 {
-			$activeValues = array_combine($groupByFields, array_fill(0, sizeof($groupByFields), null));
-			$uuids = [];
-			$table->fromDatabaseObjects($objects, function ($instance) use ($table, $fields, &$activeValues, $groupByFields, &$uuids) {
+			$activeValues=array_combine($groupByFields, array_fill(0, sizeof($groupByFields), null));
+			$uuids=[];
+			$table->fromDatabaseObjects($objects, function($instance) use ($table, $fields, &$activeValues, $groupByFields, &$uuids) {
 				$this->_instanceViewer->setInstance($instance);
 				foreach ($groupByFields as $index => $gbField) {
 					$this->_generateGroupByRow($index, $gbField, $table, $fields, $activeValues, $uuids);
@@ -221,8 +221,8 @@ 
 				return $this->_generateRow($instance, $fields, $table, null, $uuids);
 			});
 		}
-		if ($table->getRowCount() == 0) {
-			$result = $table->addRow();
+		if ($table->getRowCount()==0) {
+			$result=$table->addRow();
 			$result->mergeRow();
 			$result->setValues([
 				$this->_emptyMessage
@@ -231,20 +231,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(sizeof($fields) + 1, $newValue);
-			$result->setIdentifier($this->identifier . "-tr-gb-" . $id);
+			$uuid=uniqid("grp");
+			$uuids[$gbField]=$uuid;
+			$id=$this->_instanceViewer->getIdentifier();
+			$result=$table->addMergeRow(sizeof($fields)+1, $newValue);
+			$result->setIdentifier($this->identifier."-tr-gb-".$id);
 			$result->setProperty("data-ajax", $id);
 			$result->setProperty("data-group", $uuid);
 			$result->addToProperty("class", $this->_rowClass);
-			$activeValues[$gbField] = $newValue;
+			$activeValues[$gbField]=$newValue;
 		}
 	}
 
@@ -256,9 +256,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];
 			}
@@ -266,31 +266,31 @@ 
 		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);
 			$ck->setOnChange("event.stopPropagation();");
-			$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);
@@ -303,62 +303,62 @@ 
 
 	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();
 		$footer->addValues($this->_pagination->generateMenu($this->identifier));
 	}
 
-	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)) {
-					$js->execAtLast('$("#' . $this->getIdentifier() . ' .pagination").children("a.item").removeClass("active");$("#' . $this->getIdentifier() . ' .pagination").children("a.item[data-page=' . $page . ']:not(.no-active)").addClass("active");');
+					$js->execAtLast('$("#'.$this->getIdentifier().' .pagination").children("a.item").removeClass("active");$("#'.$this->getIdentifier().' .pagination").children("a.item[data-page='.$page.']:not(.no-active)").addClass("active");');
 				}
 			}
 		}
 	}
 
-	protected function _compileSearchFieldBehavior(JsUtils $js = NULL) {
+	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;
-		return $fieldName . "[]";
+			$fieldName="field-".$index;
+		return $fieldName."[]";
 	}
 
 	protected function _getFieldCaption($index) {
 		return null;
 	}
 
-	protected function _setToolbarPosition($table, $captions = NULL) {
+	protected function _setToolbarPosition($table, $captions=NULL) {
 		switch ($this->_toolbarPosition) {
 			case PositionInTable::BEFORETABLE:
 			case PositionInTable::AFTERTABLE:
-				if (isset($this->_compileParts) === false) {
-					$this->content[$this->_toolbarPosition] = $this->_toolbar;
+				if (isset($this->_compileParts)===false) {
+					$this->content[$this->_toolbarPosition]=$this->_toolbar;
 				}
 				break;
 			case PositionInTable::HEADER:
@@ -385,11 +385,11 @@ 
 	}
 
 	private function addToolbarRow($part, $table, $captions) {
-		$hasPart = $table->hasPart($part);
+		$hasPart=$table->hasPart($part);
 		if ($hasPart) {
-			$row = $table->getPart($part)->addRow(\sizeof($captions));
+			$row=$table->getPart($part)->addRow(\sizeof($captions));
 		} else {
-			$row = $table->getPart($part)->getRow(0);
+			$row=$table->getPart($part)->getRow(0);
 		}
 		$row->mergeCol();
 		$row->setValues([
@@ -421,12 +421,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,
@@ -449,8 +449,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;
 	}
 
@@ -465,8 +465,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;
 	}
 
@@ -475,8 +475,8 @@ 
 	 * @param array $compileParts
 	 * @return DataTable
 	 */
-	public function refresh($compileParts = ["tbody"]) {
-		$this->_compileParts = $compileParts;
+	public function refresh($compileParts=["tbody"]) {
+		$this->_compileParts=$compileParts;
 		return $this;
 	}
 
@@ -486,14 +486,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;
@@ -521,9 +521,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];
 	}
 
@@ -535,20 +535,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";
 	}
 
 	/**
@@ -557,7 +557,7 @@ 
 	 * @return DataTable
 	 */
 	public function setRefreshSelector($_refreshSelector) {
-		$this->_refreshSelector = $_refreshSelector;
+		$this->_refreshSelector=$_refreshSelector;
 		return $this;
 	}
 
@@ -569,9 +569,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() {
@@ -585,7 +585,7 @@ 
 	 * @return DataTable
 	 */
 	public function setRowClass($_rowClass) {
-		$this->_rowClass = $_rowClass;
+		$this->_rowClass=$_rowClass;
 		return $this;
 	}
 
@@ -596,34 +596,34 @@ 
 	 * @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;
 	}
 
 	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;
 	}
 
@@ -632,7 +632,7 @@ 
 		return $this;
 	}
 
-	public function trigger($event, $params = "[]") {
+	public function trigger($event, $params="[]") {
 		return $this->getHtmlComponent()->trigger($event, $params);
 	}
 
@@ -670,7 +670,7 @@ 
 	 * @param mixed $_displayBehavior
 	 */
 	public function setDisplayBehavior($_displayBehavior) {
-		$this->_displayBehavior = $_displayBehavior;
+		$this->_displayBehavior=$_displayBehavior;
 	}
 
 	/**

Ajax/service/JArray.php

Spacing +38 added lines, -38 removed lines

@@ -4,34 +4,34 @@ 
 class JArray {
 
 	public static function isAssociative($array) {
-		return (array_values($array) !== $array);
+		return (array_values($array)!==$array);
 	}
 
 	public static function getValue($array, $key, $pos) {
 		if (array_key_exists($key, $array)) {
 			return $array[$key];
 		}
-		$values = array_values($array);
-		if ($pos < sizeof($values))
+		$values=array_values($array);
+		if ($pos<sizeof($values))
 			return $values[$pos];
 	}
 
 	public static function getConditionalValue($array, $key, $condition) {
-		$result = NULL;
+		$result=NULL;
 		if (array_key_exists($key, $array)) {
-			$result = $array[$key];
-			if ($condition($result) === true)
+			$result=$array[$key];
+			if ($condition($result)===true)
 				return $result;
 		}
-		$values = array_values($array);
+		$values=array_values($array);
 		foreach ($values as $val) {
-			if ($condition($val) === true)
+			if ($condition($val)===true)
 				return $val;
 		}
 		return $result;
 	}
 
-	public static function getDefaultValue($array, $key, $default = NULL) {
+	public static function getDefaultValue($array, $key, $default=NULL) {
 		if (array_key_exists($key, $array)) {
 			return $array[$key];
 		} else
@@ -39,77 +39,77 @@ 
 	}
 
 	public static function implode($glue, $pieces) {
-		$result = "";
+		$result="";
 		if (\is_array($glue)) {
-			$size = \sizeof($pieces);
-			if ($size > 0) {
-				for ($i = 0; $i < $size - 1; $i ++) {
-					$result .= $pieces[$i] . @$glue[$i];
+			$size=\sizeof($pieces);
+			if ($size>0) {
+				for ($i=0; $i<$size-1; $i++) {
+					$result.=$pieces[$i].@$glue[$i];
 				}
-				$result .= $pieces[$size - 1];
+				$result.=$pieces[$size-1];
 			}
 		} else {
-			$result = \implode($glue, $pieces);
+			$result=\implode($glue, $pieces);
 		}
 		return $result;
 	}
 
 	public static function dimension($array) {
 		if (\is_array(reset($array))) {
-			$return = self::dimension(reset($array)) + 1;
+			$return=self::dimension(reset($array))+1;
 		} else {
-			$return = 1;
+			$return=1;
 		}
 		return $return;
 	}
 
-	public static function sortAssociative($array, $sortedKeys = array()) {
-		$newArray = array();
+	public static function sortAssociative($array, $sortedKeys=array()) {
+		$newArray=array();
 		foreach ($sortedKeys as $key) {
 			if (\array_key_exists($key, $array)) {
-				$newArray[$key] = $array[$key];
+				$newArray[$key]=$array[$key];
 			}
 		}
 		return $newArray;
 	}
 
 	public static function moveElementTo(&$array, $from, $to) {
-		$result = false;
+		$result=false;
 		if (isset($array)) {
 			if (isset($array[$from])) {
-				$out = array_splice($array, $from, 1);
+				$out=array_splice($array, $from, 1);
 				array_splice($array, $to, 0, $out);
-				$result = true;
+				$result=true;
 			}
 		}
 		return $result;
 	}
 
 	public static function swapElements(&$array, $index1, $index2) {
-		$result = false;
+		$result=false;
 		if (isset($array)) {
 			if (isset($array[$index1]) && isset($array[$index2])) {
-				$tmp = $array[$index1];
-				$array[$index1] = $array[$index2];
-				$array[$index2] = $tmp;
-				$result = true;
+				$tmp=$array[$index1];
+				$array[$index1]=$array[$index2];
+				$array[$index2]=$tmp;
+				$result=true;
 			}
 		}
 		return $result;
 	}
 
-	public static function modelArray($objects, $identifierFunction = NULL, $modelFunction = NULL) {
-		$result = [];
-		if (isset($modelFunction) === false) {
-			$modelFunction = "__toString";
+	public static function modelArray($objects, $identifierFunction=NULL, $modelFunction=NULL) {
+		$result=[];
+		if (isset($modelFunction)===false) {
+			$modelFunction="__toString";
 		}
-		if (isset($identifierFunction) === false) {
+		if (isset($identifierFunction)===false) {
 			foreach ($objects as $object) {
-				$result[] = self::callFunction($object, $modelFunction);
+				$result[]=self::callFunction($object, $modelFunction);
 			}
 		} else {
 			foreach ($objects as $object) {
-				$result[self::callFunction($object, $identifierFunction)] = self::callFunction($object, $modelFunction);
+				$result[self::callFunction($object, $identifierFunction)]=self::callFunction($object, $modelFunction);
 			}
 		}
 		return $result;
@@ -134,9 +134,9 @@ 
 	}
 
 	public static function removeByKeys($array, $keys) {
-		$assocKeys = [];
+		$assocKeys=[];
 		foreach ($keys as $key) {
-			$assocKeys[$key] = true;
+			$assocKeys[$key]=true;
 		}
 		return \array_diff_key($array, $assocKeys);
 	}

Ajax/semantic/html/elements/HtmlButton.php

Spacing +40 added lines, -40 removed lines

@@ -30,9 +30,9 @@ 
 	 * @param string $onClick
 	 *        	JS Code for click event
 	 */
-	public function __construct($identifier, $value = null, $cssStyle = null, $onClick = null) {
+	public function __construct($identifier, $value=null, $cssStyle=null, $onClick=null) {
 		parent::__construct($identifier, "button", "ui button");
-		$this->content = $value;
+		$this->content=$value;
 		if (isset($cssStyle)) {
 			$this->setStyle($cssStyle);
 		}
@@ -51,12 +51,12 @@ 
 		if (is_array($this->content)) {
 			foreach ($this->content as $i => $content) {
 				if (is_string($content)) {
-					$this->content[$i] = $value;
+					$this->content[$i]=$value;
 					return $this;
 				}
 			}
 		}
-		$this->content = $value;
+		$this->content=$value;
 		return $this;
 	}
 
@@ -70,8 +70,8 @@ 
 		return $this->addToProperty("class", $cssStyle);
 	}
 
-	public function setFocusable($value = true) {
-		if ($value === true)
+	public function setFocusable($value=true) {
+		if ($value===true)
 			$this->setProperty("tabindex", "0");
 		else {
 			$this->removeProperty("tabindex");
@@ -79,16 +79,16 @@ 
 		return $this;
 	}
 
-	public function setAnimated($content, $animation = "") {
+	public function setAnimated($content, $animation="") {
 		$this->setTagName("div");
-		$this->addToProperty("class", "animated " . $animation);
-		$visible = new HtmlSemDoubleElement("visible-" . $this->identifier, "div");
+		$this->addToProperty("class", "animated ".$animation);
+		$visible=new HtmlSemDoubleElement("visible-".$this->identifier, "div");
 		$visible->setClass("visible content");
 		$visible->setContent($this->content);
-		$hidden = new HtmlSemDoubleElement("hidden-" . $this->identifier, "div");
+		$hidden=new HtmlSemDoubleElement("hidden-".$this->identifier, "div");
 		$hidden->setClass("hidden content");
 		$hidden->setContent($content);
-		$this->content = array(
+		$this->content=array(
 			$visible,
 			$hidden
 		);
@@ -101,12 +101,12 @@ 
 	 * @return HtmlButton
 	 */
 	public function asIcon($icon) {
-		$iconO = $icon;
+		$iconO=$icon;
 		if (\is_string($icon)) {
-			$iconO = new HtmlIcon("icon-" . $this->identifier, $icon);
+			$iconO=new HtmlIcon("icon-".$this->identifier, $icon);
 		}
 		$this->addToProperty("class", "icon");
-		$this->content = $iconO;
+		$this->content=$iconO;
 		return $this;
 	}
 
@@ -123,19 +123,19 @@ 
 	 * @param string $icon
 	 * @return HtmlLabel
 	 */
-	public function addLabel($label, $before = false, $icon = NULL) {
-		$this->tagName = "div";
-		$prefix = "";
+	public function addLabel($label, $before=false, $icon=NULL) {
+		$this->tagName="div";
+		$prefix="";
 		if ($before)
-			$prefix = "left ";
-		$this->addToProperty("class", $prefix . "labeled");
-		$isIcon = (isset($this->content[0]) && $this->content[0] instanceof HtmlIcon);
-		$this->content = new HtmlButton("button-" . $this->identifier, $this->content);
+			$prefix="left ";
+		$this->addToProperty("class", $prefix."labeled");
+		$isIcon=(isset($this->content[0]) && $this->content[0] instanceof HtmlIcon);
+		$this->content=new HtmlButton("button-".$this->identifier, $this->content);
 		if ($isIcon) {
 			$this->content->addClass("icon");
 		}
 		$this->content->setTagName("div");
-		$label = new HtmlLabel("label-" . $this->identifier, $label, $icon, "a");
+		$label=new HtmlLabel("label-".$this->identifier, $label, $icon, "a");
 		$label->setBasic();
 		$this->addContent($label, $before);
 		return $label;
@@ -146,7 +146,7 @@ 
 	 * @see \Ajax\common\html\BaseHtml::fromArray()
 	 */
 	public function fromArray($array) {
-		$array = parent::fromArray($array);
+		$array=parent::fromArray($array);
 		foreach ($array as $key => $value) {
 			$this->setProperty($key, $value);
 		}
@@ -187,9 +187,9 @@ 
 	 *
 	 * @return HtmlButton
 	 */
-	public function setToggle($active = "") {
-		$this->onCreate("$('#" . $this->identifier . "').state();");
-		return $this->addToProperty("class", "toggle " . $active);
+	public function setToggle($active="") {
+		$this->onCreate("$('#".$this->identifier."').state();");
+		return $this->addToProperty("class", "toggle ".$active);
 	}
 
 	/**
@@ -225,10 +225,10 @@ 
 	 * @param string $value
 	 * @return HtmlButton
 	 */
-	public static function social($identifier, $social, $value = NULL) {
-		if ($value === NULL)
-			$value = \ucfirst($social);
-		$return = new HtmlButton($identifier, $value);
+	public static function social($identifier, $social, $value=NULL) {
+		if ($value===NULL)
+			$value=\ucfirst($social);
+		$return=new HtmlButton($identifier, $value);
 		$return->addIcon($social);
 		return $return->addToPropertyCtrl("class", $social, Social::getConstants());
 	}
@@ -242,8 +242,8 @@ 
 	 * @param boolean $before
 	 * @return \Ajax\semantic\html\elements\HtmlButton
 	 */
-	public static function labeled($identifier, $value, $icon, $before = true) {
-		$result = new HtmlButton($identifier, $value);
+	public static function labeled($identifier, $value, $icon, $before=true) {
+		$result=new HtmlButton($identifier, $value);
 		$result->addIcon($icon, $before, true);
 		return $result;
 	}
@@ -256,7 +256,7 @@ 
 	 * @return HtmlButton
 	 */
 	public static function icon($identifier, $icon) {
-		$result = new HtmlButton($identifier);
+		$result=new HtmlButton($identifier);
 		$result->asIcon($icon);
 		return $result;
 	}
@@ -266,7 +266,7 @@ 
 	 * {@inheritdoc}
 	 * @see HtmlSemDoubleElement::asLink()
 	 */
-	public function asLink($href = NULL, $target = NULL) {
+	public function asLink($href=NULL, $target=NULL) {
 		parent::asLink($href, $target);
 		return $this;
 	}
@@ -281,20 +281,20 @@ 
 	 * @param string $icon
 	 * @return HtmlButtonGroups
 	 */
-	public static function dropdown($identifier, $value, $items = [], $asCombo = false, $icon = null) {
-		$result = new HtmlButtonGroups($identifier, [
+	public static function dropdown($identifier, $value, $items=[], $asCombo=false, $icon=null) {
+		$result=new HtmlButtonGroups($identifier, [
 			$value
 		]);
-		$dd = $result->addDropdown($items, $asCombo);
+		$dd=$result->addDropdown($items, $asCombo);
 		if (isset($icon) && $dd instanceof HtmlDropdown)
 			$dd->setIcon($icon);
 		return $result;
 	}
 
-	public function addPopupConfirmation($message, $buttons = ["Okay","Cancel"]) {
-		$elm = new HtmlSemDoubleElement('popup-confirm-' . $this->_identifier);
+	public function addPopupConfirmation($message, $buttons=["Okay", "Cancel"]) {
+		$elm=new HtmlSemDoubleElement('popup-confirm-'.$this->_identifier);
 		$elm->setContent([
-			'message' => new HtmlSemDoubleElement('popup-confirm-message-' . $this->_identifier, 'p', '', $message)
+			'message' => new HtmlSemDoubleElement('popup-confirm-message-'.$this->_identifier, 'p', '', $message)
 		]);
 		$this->addPopupHtml($elm, null, [
 			'on' => 'click'