phpMv / phpMv-UI

Ajax/ui/properties/Animation.php

Spacing +1 added lines, -1 removed lines

@@ -11,7 +11,7 @@
  */
 class Animation extends BaseComponent {
 
-	public function __construct($duration = 400, $easing = "swing", $queue = false) {
+	public function __construct($duration=400, $easing="swing", $queue=false) {
 		$this->setDuration($duration);
 		$this->setEasing($easing);
 		$this->setQueue($queue);

Ajax/semantic/html/base/HtmlSemDoubleElement.php

Spacing +36 added lines, -36 removed lines

@@ -23,22 +23,22 @@ 
 class HtmlSemDoubleElement extends HtmlDoubleElement {
 	use BaseTrait;
 
-	protected $_popup = NULL;
+	protected $_popup=NULL;
 
-	protected $_dimmer = NULL;
+	protected $_dimmer=NULL;
 
-	protected $_toast = NULL;
+	protected $_toast=NULL;
 
-	protected $_sidebar = NULL;
+	protected $_sidebar=NULL;
 
-	protected $_params = array();
+	protected $_params=array();
 
-	public function __construct($identifier, $tagName = "p", $baseClass = "ui", $content = NULL) {
+	public function __construct($identifier, $tagName="p", $baseClass="ui", $content=NULL) {
 		parent::__construct($identifier, $tagName);
-		$this->_baseClass = $baseClass;
+		$this->_baseClass=$baseClass;
 		$this->setClass($baseClass);
 		if (isset($content)) {
-			$this->content = $content;
+			$this->content=$content;
 		}
 	}
 
@@ -48,7 +48,7 @@ 
 	 * @param string $variation
 	 * @param string $popupEvent
 	 */
-	public function setPopupAttributes($variation = NULL, $popupEvent = NULL) {
+	public function setPopupAttributes($variation=NULL, $popupEvent=NULL) {
 		if (isset($this->_popup))
 			$this->_popup->setAttributes($variation, $popupEvent);
 	}
@@ -62,8 +62,8 @@ 
 	 * @param array $params
 	 * @return HtmlSemDoubleElement
 	 */
-	public function addPopup($title = "", $content = "", $variation = NULL, $params = array()) {
-		$this->_popup = new InternalPopup($this, $title, $content, $variation, $params);
+	public function addPopup($title="", $content="", $variation=NULL, $params=array()) {
+		$this->_popup=new InternalPopup($this, $title, $content, $variation, $params);
 		return $this;
 	}
 
@@ -75,8 +75,8 @@ 
 	 * @param array $params
 	 * @return HtmlSemDoubleElement
 	 */
-	public function addPopupHtml($html = "", $variation = NULL, $params = array()) {
-		$this->_popup = new InternalPopup($this);
+	public function addPopupHtml($html="", $variation=NULL, $params=array()) {
+		$this->_popup=new InternalPopup($this);
 		$this->_popup->setHtml($html);
 		$this->_popup->setAttributes($variation, $params);
 		return $this;
@@ -89,8 +89,8 @@ 
 	 * @param mixed $content
 	 * @return HtmlDimmer
 	 */
-	public function addDimmer($params = array(), $content = NULL) {
-		$dimmer = new HtmlDimmer("dimmer-" . $this->identifier, $content);
+	public function addDimmer($params=array(), $content=NULL) {
+		$dimmer=new HtmlDimmer("dimmer-".$this->identifier, $content);
 		$dimmer->setParams($params);
 		$dimmer->setContainer($this);
 		$this->addContent($dimmer);
@@ -105,10 +105,10 @@ 
 	 * @param string $icon
 	 * @return mixed|HtmlLabel
 	 */
-	public function addLabel($label, $before = false, $icon = NULL) {
-		$labelO = $label;
-		if (\is_object($label) === false) {
-			$labelO = new HtmlLabel("label-" . $this->identifier, $label);
+	public function addLabel($label, $before=false, $icon=NULL) {
+		$labelO=$label;
+		if (\is_object($label)===false) {
+			$labelO=new HtmlLabel("label-".$this->identifier, $label);
 			if (isset($icon))
 				$labelO->addIcon($icon);
 		} else {
@@ -129,8 +129,8 @@ 
 	 * @param string $icon
 	 * @return HtmlSemDoubleElement
 	 */
-	public function attachLabel($label, $side = Side::TOP, $direction = Direction::NONE, $icon = NULL) {
-		$label = $this->addLabel($label, true, $icon);
+	public function attachLabel($label, $side=Side::TOP, $direction=Direction::NONE, $icon=NULL) {
+		$label=$this->addLabel($label, true, $icon);
 		$label->setAttached($side, $direction);
 		return $this;
 	}
@@ -140,7 +140,7 @@ 
 	 *
 	 * @return HtmlSemDoubleElement
 	 */
-	public function asLink($href = NULL, $target = NULL) {
+	public function asLink($href=NULL, $target=NULL) {
 		if (isset($href))
 			$this->setProperty("href", $href);
 		if (isset($target))
@@ -154,11 +154,11 @@ 
 	 * @param boolean $show
 	 * @return string
 	 */
-	public function jsShowDimmer($show = true) {
-		$status = "hide";
-		if ($show === true)
-			$status = "show";
-		return '$("#.' . $this->identifier . ').dimmer("' . $status . '");';
+	public function jsShowDimmer($show=true) {
+		$status="hide";
+		if ($show===true)
+			$status="show";
+		return '$("#.'.$this->identifier.').dimmer("'.$status.'");';
 	}
 
 	/**
@@ -166,7 +166,7 @@ 
 	 * {@inheritdoc}
 	 * @see BaseHtml::compile()
 	 */
-	public function compile(JsUtils $js = NULL, &$view = NULL) {
+	public function compile(JsUtils $js=NULL, &$view=NULL) {
 		if (isset($this->_popup)) {
 			$this->_popup->compile($js);
 		}
@@ -179,7 +179,7 @@ 
 	 * @see HtmlDoubleElement::run()
 	 */
 	public function run(JsUtils $js) {
-		$this->_bsComponent = $js->semantic()->generic("#" . $this->identifier);
+		$this->_bsComponent=$js->semantic()->generic("#".$this->identifier);
 		parent::run($js);
 		$this->addEventsOnRun($js);
 		if (isset($this->_popup)) {
@@ -197,8 +197,8 @@ 
 	 * @param boolean $ordered
 	 * @return \Ajax\common\html\html5\HtmlList
 	 */
-	public function addList($items, $ordered = false) {
-		$list = new HtmlList("list-" . $this->identifier, $items);
+	public function addList($items, $ordered=false) {
+		$list=new HtmlList("list-".$this->identifier, $items);
 		$list->setOrdered($ordered);
 		$list->setClass("ui list");
 		$this->addContent($list);
@@ -210,9 +210,9 @@ 
 	 * @param ?array $params
 	 * @return \Ajax\semantic\components\Toast
 	 */
-	public function asToast($params = NULL) {
-		$this->_toast = new Toast();
-		$this->_toast->attach('#' . $this->_identifier);
+	public function asToast($params=NULL) {
+		$this->_toast=new Toast();
+		$this->_toast->attach('#'.$this->_identifier);
 		$this->setProperty('style', 'display:none;');
 		if (isset($params)) {
 			$this->_toast->setParams($params);
@@ -226,8 +226,8 @@ 
 	 * @param string $classes
 	 * @return \Ajax\semantic\components\Sidebar
 	 */
-	public function asSideBar($classes = '') {
-		$this->_sidebar = new Sidebar();
+	public function asSideBar($classes='') {
+		$this->_sidebar=new Sidebar();
 		$this->addToProperty('class', 'sidebar');
 		return $this->_sidebar;
 	}

Ajax/semantic/components/Sidebar.php

Spacing +13 added lines, -13 removed lines

@@ -14,9 +14,9 @@ 
  */
 class Sidebar extends SimpleSemExtComponent {
 
-	public function __construct(JsUtils $js = NULL) {
+	public function __construct(JsUtils $js=NULL) {
 		parent::__construct($js);
-		$this->uiName = 'sidebar';
+		$this->uiName='sidebar';
 	}
 
 	public function show() {
@@ -46,32 +46,32 @@ 
 	}
 
 	public function setContext($value) {
-		$this->params['context'] = $value;
+		$this->params['context']=$value;
 		return $this;
 	}
 
-	public function setExclusive($value = true) {
-		$this->params['exclusive'] = true;
+	public function setExclusive($value=true) {
+		$this->params['exclusive']=true;
 		return $this;
 	}
 
-	public function setClosable($value = true) {
-		$this->params['closable'] = $value;
+	public function setClosable($value=true) {
+		$this->params['closable']=$value;
 		return $this;
 	}
 
-	public function setDimPage($value = true) {
-		$this->params['dimPage'] = $value;
+	public function setDimPage($value=true) {
+		$this->params['dimPage']=$value;
 		return $this;
 	}
 
-	public function setScrollLock($value = false) {
-		$this->params['scrollLock'] = $value;
+	public function setScrollLock($value=false) {
+		$this->params['scrollLock']=$value;
 		return $this;
 	}
 
-	public function setReturnScroll($value = false) {
-		$this->params['returnScroll'] = $value;
+	public function setReturnScroll($value=false) {
+		$this->params['returnScroll']=$value;
 		return $this;
 	}
 

Ajax/common/BaseGui.php

Spacing +17 added lines, -17 removed lines

@@ -29,10 +29,10 @@ 
 	 */
 	protected $js;
 
-	public function __construct($autoCompile = true) {
-		$this->autoCompile = $autoCompile;
-		$this->components = array();
-		$this->htmlComponents = array();
+	public function __construct($autoCompile=true) {
+		$this->autoCompile=$autoCompile;
+		$this->components=array();
+		$this->htmlComponents=array();
 	}
 
 	public function isAutoCompile() {
@@ -40,12 +40,12 @@ 
 	}
 
 	public function setAutoCompile($autoCompile) {
-		$this->autoCompile = $autoCompile;
+		$this->autoCompile=$autoCompile;
 		return $this;
 	}
 
-	public function compile($internal = false) {
-		if ($internal === false && $this->autoCompile === true)
+	public function compile($internal=false) {
+		if ($internal===false && $this->autoCompile===true)
 			throw new \Exception("Impossible to compile if autoCompile is set to 'true'");
 		foreach ($this->components as $component) {
 			$component->compile();
@@ -53,20 +53,20 @@ 
 	}
 
 	public function setJs(JsUtils $js) {
-		$this->js = $js;
+		$this->js=$js;
 	}
 
 	public function addComponent(SimpleComponent $component, $attachTo, $params) {
 		if ($this->autoCompile) {
-			if ($attachTo != null) {
-				if (! isset($this->components[$attachTo])) {
-					$this->components[$attachTo] = $component;
+			if ($attachTo!=null) {
+				if (!isset($this->components[$attachTo])) {
+					$this->components[$attachTo]=$component;
 				} else {
-					$this->components[] = $component;
+					$this->components[]=$component;
 				}
 				$component->attach($attachTo);
 			} else {
-				$this->components[] = $component;
+				$this->components[]=$component;
 			}
 		}
 		if (isset($params))
@@ -76,11 +76,11 @@ 
 	}
 
 	public function addHtmlComponent(BaseHtml $htmlComponent) {
-		$this->htmlComponents[$htmlComponent->getIdentifier()] = $htmlComponent;
+		$this->htmlComponents[$htmlComponent->getIdentifier()]=$htmlComponent;
 		return $htmlComponent;
 	}
 
-	public function compileHtml(JsUtils $js = NULL, &$view = NULL) {
+	public function compileHtml(JsUtils $js=NULL, &$view=NULL) {
 		foreach ($this->htmlComponents as $htmlComponent) {
 			$htmlComponent->compile($js, $view);
 		}
@@ -90,7 +90,7 @@ 
 		return array_filter($this->htmlComponents, $callback);
 	}
 	
-	public function getHtmlComponent($identifier){
-		return $this->htmlComponents[$identifier]??'';
+	public function getHtmlComponent($identifier) {
+		return $this->htmlComponents[$identifier] ?? '';
 	}
 }

Ajax/service/Javascript.php

Spacing +17 added lines, -17 removed lines

@@ -3,28 +3,28 @@ 
 
 class Javascript {
 
-	public static $preventDefault = "\nif(event && event.preventDefault) event.preventDefault();\n";
+	public static $preventDefault="\nif(event && event.preventDefault) event.preventDefault();\n";
 
-	public static $stopPropagation = "\nif(event && event.stopPropagation) event.stopPropagation();\n";
+	public static $stopPropagation="\nif(event && event.stopPropagation) event.stopPropagation();\n";
 
-	public static function draggable($attr = "id") {
-		return 'var dt=event.dataTransfer || event.originalEvent.dataTransfer;dt.setData("text/plain",JSON.stringify({id:$(event.target).attr("id"),data:$(event.target).attr("' . $attr . '")}));';
+	public static function draggable($attr="id") {
+		return 'var dt=event.dataTransfer || event.originalEvent.dataTransfer;dt.setData("text/plain",JSON.stringify({id:$(event.target).attr("id"),data:$(event.target).attr("'.$attr.'")}));';
 	}
 
-	public static function dropZone($jqueryDone, $jsCallback = "") {
-		$done = ($jqueryDone != null) ? '$(event.target).' . $jqueryDone . '($("#"+_data.id));' : '';
-		return 'var dt=event.dataTransfer || event.originalEvent.dataTransfer;var _data=JSON.parse(dt.getData("text/plain"));' . $done . 'var data=_data.data;' . $jsCallback;
+	public static function dropZone($jqueryDone, $jsCallback="") {
+		$done=($jqueryDone!=null) ? '$(event.target).'.$jqueryDone.'($("#"+_data.id));' : '';
+		return 'var dt=event.dataTransfer || event.originalEvent.dataTransfer;var _data=JSON.parse(dt.getData("text/plain"));'.$done.'var data=_data.data;'.$jsCallback;
 	}
 
 	public static function containsCode($expression) {
-		return strrpos($expression, 'this') !== false || strrpos($expression, 'event') !== false || strrpos($expression, 'self') !== false;
+		return strrpos($expression, 'this')!==false || strrpos($expression, 'event')!==false || strrpos($expression, 'self')!==false;
 	}
 
 	public static function isFunction($jsCode) {
 		return JString::startswith($jsCode, "function");
 	}
 
-	public static function fileUploadBehavior($id = '') {
+	public static function fileUploadBehavior($id='') {
 		return "$('input:text, .ui.button', '#{$id}').on('click', function (e) {e.preventDefault();\$('input:file', '#{$id}').click();});
 				$('input:file', '#{$id}').on('change', function (e) {if(e.target.files.length){var name = e.target.files[0].name;$('input:text', $(e.target).parent()).val(name);}});";
 	}
@@ -38,8 +38,8 @@ 
 	 * @return string
 	 */
 	public static function prep_element($element) {
-		if (self::containsCode($element) === false) {
-			$element = '"' . addslashes($element) . '"';
+		if (self::containsCode($element)===false) {
+			$element='"'.addslashes($element).'"';
 		}
 		return $element;
 	}
@@ -54,24 +54,24 @@ 
 	 */
 	public static function prep_value($value) {
 		if (\is_array($value)) {
-			$value = implode(",", $value);
+			$value=implode(",", $value);
 		}
-		if (self::containsCode($value) === false) {
-			$value = \str_replace([
+		if (self::containsCode($value)===false) {
+			$value=\str_replace([
 				"\\",
 				"\""
 			], [
 				"\\\\",
 				"\\\""
 			], $value);
-			$value = '"' . $value . '"';
+			$value='"'.$value.'"';
 		}
 		return trim($value, "%");
 	}
 
 	public static function prep_jquery_selector($value) {
-		if (JString::startswith($value, '$(') === false) {
-			return '$(' . self::prep_value($value) . ')';
+		if (JString::startswith($value, '$(')===false) {
+			return '$('.self::prep_value($value).')';
 		}
 		return $value;
 	}

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}).trigger('close-message');");
+				$js->execOn("click", "#".$this->identifier." .close", "$(this).closest('.message').transition({$this->_closeTransition}).trigger('close-message');");
 			}
 			if (isset($this->_timeout)) {
 				$js->exec("setTimeout(function() { $('#{$this->identifier}').transition({$this->_closeTransition}).trigger('close-message'); }, {$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/service/AjaxCall.php

Spacing +23 added lines, -23 removed lines

@@ -10,50 +10,50 @@ 
 	private $parameters;
 
 	public function __construct($method, $parameters) {
-		$this->method = $method;
-		$this->parameters = $parameters;
+		$this->method=$method;
+		$this->parameters=$parameters;
 	}
 
-	public function compile(JsUtils $js = null) {
-		if ($js === null)
+	public function compile(JsUtils $js=null) {
+		if ($js===null)
 			return;
-		$params = "{}";
-		$stopPropagation = true;
-		$preventDefault = true;
-		$method = "get";
-		$this->parameters["immediatly"] = false;
+		$params="{}";
+		$stopPropagation=true;
+		$preventDefault=true;
+		$method="get";
+		$this->parameters["immediatly"]=false;
 		extract($this->parameters);
-		$result = $this->_eventPreparing($preventDefault, $stopPropagation);
+		$result=$this->_eventPreparing($preventDefault, $stopPropagation);
 		switch ($this->method) {
 			case "get":
-				$result .= $js->getDeferred($url, $responseElement, $this->parameters);
+				$result.=$js->getDeferred($url, $responseElement, $this->parameters);
 				break;
 			case "post":
-				$result .= $js->postDeferred($url, $params, $responseElement, $this->parameters);
+				$result.=$js->postDeferred($url, $params, $responseElement, $this->parameters);
 				break;
 			case "postForm":
-				$result .= $js->postFormDeferred($url, $form, $responseElement, $this->parameters);
+				$result.=$js->postFormDeferred($url, $form, $responseElement, $this->parameters);
 				break;
 			case "json":
-				$result .= $js->jsonDeferred($url, $method, $this->parameters);
+				$result.=$js->jsonDeferred($url, $method, $this->parameters);
 				break;
 			case "jsonArray":
-				$result .= $js->jsonArrayDeferred($modelSelector, $url, $method, $this->parameters);
+				$result.=$js->jsonArrayDeferred($modelSelector, $url, $method, $this->parameters);
 				break;
 			default:
-				$result .= $js->ajaxDeferred($this->method, $url, $responseElement, $this->parameters);
+				$result.=$js->ajaxDeferred($this->method, $url, $responseElement, $this->parameters);
 				break;
 		}
 		return $result;
 	}
 
 	protected function _eventPreparing($preventDefault, $stopPropagation) {
-		$result = "";
-		if ($preventDefault === true) {
-			$result .= Javascript::$preventDefault;
+		$result="";
+		if ($preventDefault===true) {
+			$result.=Javascript::$preventDefault;
 		}
-		if ($stopPropagation === true) {
-			$result .= Javascript::$stopPropagation;
+		if ($stopPropagation===true) {
+			$result.=Javascript::$stopPropagation;
 		}
 		return $result;
 	}
@@ -63,7 +63,7 @@ 
 	}
 
 	public function setMethod($method) {
-		$this->method = $method;
+		$this->method=$method;
 		return $this;
 	}
 
@@ -72,7 +72,7 @@ 
 	}
 
 	public function setParameters($parameters) {
-		$this->parameters = $parameters;
+		$this->parameters=$parameters;
 		return $this;
 	}
 }

Ajax/semantic/html/modules/HtmlDropdown.php

Spacing +94 added lines, -94 removed lines

@@ -13,17 +13,17 @@ 
 use Ajax\service\JArray;
 
 class HtmlDropdown extends HtmlSemDoubleElement {
-	use FieldTrait,LabeledIconTrait {
+	use FieldTrait, LabeledIconTrait {
 		addIcon as addIconP;
 	}
 
-	protected $mClass = "menu";
+	protected $mClass="menu";
 
-	protected $mTagName = "div";
+	protected $mTagName="div";
 
-	protected $items = array();
+	protected $items=array();
 
-	protected $_params = array(
+	protected $_params=array(
 		"action" => "nothing",
 		"on" => "hover",
 		"showOnFocus" => true
@@ -37,29 +37,29 @@ 
 
 	protected $_multiple;
 
-	public function __construct($identifier, $value = "", $items = array(), $associative = true) {
+	public function __construct($identifier, $value="", $items=array(), $associative=true) {
 		parent::__construct($identifier, "div");
-		$this->_template = include dirname(__FILE__) . '/../templates/tplDropdown.php';
+		$this->_template=include dirname(__FILE__).'/../templates/tplDropdown.php';
 		$this->setProperty("class", "ui dropdown");
-		$this->_multiple = false;
-		$content = [];
-		$text = '';
+		$this->_multiple=false;
+		$content=[];
+		$text='';
 		if ($value instanceof HtmlSemDoubleElement) {
-			$text = $value;
-		} elseif ($value !== null) {
-			$text = new HtmlSemDoubleElement("text-" . $this->identifier, "div");
+			$text=$value;
+		} elseif ($value!==null) {
+			$text=new HtmlSemDoubleElement("text-".$this->identifier, "div");
 			$text->setClass("text");
 			$this->setValue($value);
 		}
-		if ($text != null) {
-			$content = [
+		if ($text!=null) {
+			$content=[
 				"text" => $text
 			];
 		}
-		$content["arrow"] = new HtmlIcon($identifier . "-icon", "dropdown");
-		$this->content = $content;
-		$this->tagName = "div";
-		$this->_associative = $associative;
+		$content["arrow"]=new HtmlIcon($identifier."-icon", "dropdown");
+		$this->content=$content;
+		$this->tagName="div";
+		$this->_associative=$associative;
 		$this->addItems($items);
 	}
 
@@ -71,16 +71,16 @@ 
 		return $this->input;
 	}
 
-	public function addItem($item, $value = NULL, $image = NULL, $description = NULL) {
-		$itemO = $this->beforeAddItem($item, $value, $image, $description);
-		$this->items[] = $itemO;
+	public function addItem($item, $value=NULL, $image=NULL, $description=NULL) {
+		$itemO=$this->beforeAddItem($item, $value, $image, $description);
+		$this->items[]=$itemO;
 		return $itemO;
 	}
 
-	public function addIcon($icon, $before = true, $labeled = false) {
+	public function addIcon($icon, $before=true, $labeled=false) {
 		$this->removeArrow();
 		$this->addIconP($icon, $before, $labeled);
-		$elm = $this->getElementById("text-" . $this->identifier, $this->content);
+		$elm=$this->getElementById("text-".$this->identifier, $this->content);
 		if (isset($elm)) {
 			$elm->setWrapAfter("");
 		}
@@ -88,8 +88,8 @@ 
 	}
 
 	public function addIcons($icons) {
-		$count = $this->count();
-		for ($i = 0; $i < \sizeof($icons) && $i < $count; $i ++) {
+		$count=$this->count();
+		for ($i=0; $i<\sizeof($icons) && $i<$count; $i++) {
 			$this->getItem($i)->addIcon($icons[$i]);
 		}
 	}
@@ -101,32 +101,32 @@ 
 	 * @param int $position
 	 * @return HtmlDropdownItem
 	 */
-	public function insertItem($item, $position = 0) {
-		$itemO = $this->beforeAddItem($item);
-		$start = array_slice($this->items, 0, $position);
-		$end = array_slice($this->items, $position);
-		$start[] = $item;
-		$this->items = array_merge($start, $end);
+	public function insertItem($item, $position=0) {
+		$itemO=$this->beforeAddItem($item);
+		$start=array_slice($this->items, 0, $position);
+		$end=array_slice($this->items, $position);
+		$start[]=$item;
+		$this->items=array_merge($start, $end);
 		return $itemO;
 	}
 
 	protected function removeArrow() {
-		if (\sizeof($this->content) > 1) {
+		if (\sizeof($this->content)>1) {
 			unset($this->content["arrow"]);
-			$this->content = \array_values($this->content);
+			$this->content=\array_values($this->content);
 		}
 	}
 
-	protected function beforeAddItem($item, $value = NULL, $image = NULL, $description = NULL) {
-		$itemO = $item;
+	protected function beforeAddItem($item, $value=NULL, $image=NULL, $description=NULL) {
+		$itemO=$item;
 		if (\is_array($item)) {
-			$description = JArray::getValue($item, "description", 3);
-			$value = JArray::getValue($item, "value", 1);
-			$image = JArray::getValue($item, "image", 2);
-			$item = JArray::getValue($item, "item", 0);
+			$description=JArray::getValue($item, "description", 3);
+			$value=JArray::getValue($item, "value", 1);
+			$image=JArray::getValue($item, "image", 2);
+			$item=JArray::getValue($item, "item", 0);
 		}
-		if (! $item instanceof HtmlDropdownItem) {
-			$itemO = new HtmlDropdownItem("dd-item-" . $this->identifier . "-" . \sizeof($this->items), $item, $value, $image, $description);
+		if (!$item instanceof HtmlDropdownItem) {
+			$itemO=new HtmlDropdownItem("dd-item-".$this->identifier."-".\sizeof($this->items), $item, $value, $image, $description);
 		} elseif ($itemO instanceof HtmlDropdownItem) {
 			$this->addToProperty("class", "vertical");
 		}
@@ -142,11 +142,11 @@ 
 	}
 
 	public function addInput($name) {
-		if (! isset($name))
-			$name = "input-" . $this->identifier;
+		if (!isset($name))
+			$name="input-".$this->identifier;
 		$this->setAction("activate");
-		$this->input = new HtmlInput($name, "hidden");
-		$this->input->setIdentifier("input-" . $this->identifier);
+		$this->input=new HtmlInput($name, "hidden");
+		$this->input->setIdentifier("input-".$this->identifier);
 		return $this->input;
 	}
 
@@ -157,7 +157,7 @@ 
 	 * @param string $icon
 	 * @return HtmlDropdownItem
 	 */
-	public function addSearchInputItem($placeHolder = NULL, $icon = NULL) {
+	public function addSearchInputItem($placeHolder=NULL, $icon=NULL) {
 		return $this->addItem(HtmlDropdownItem::searchInput($placeHolder, $icon));
 	}
 
@@ -177,7 +177,7 @@ 
 	 * @param string $icon
 	 * @return HtmlDropdownItem
 	 */
-	public function addHeaderItem($caption = NULL, $icon = NULL) {
+	public function addHeaderItem($caption=NULL, $icon=NULL) {
 		return $this->addItem(HtmlDropdownItem::header($caption, $icon));
 	}
 
@@ -222,12 +222,12 @@ 
 	 * @return $this
 	 */
 	public function setPropertyValues($property, $values) {
-		$i = 0;
-		if (\is_array($values) === false) {
-			$values = \array_fill(0, $this->count(), $values);
+		$i=0;
+		if (\is_array($values)===false) {
+			$values=\array_fill(0, $this->count(), $values);
 		}
 		foreach ($values as $value) {
-			$c = $this->items[$i ++];
+			$c=$this->items[$i++];
 			if (isset($c)) {
 				$c->setProperty($property, $value);
 			} else {
@@ -261,12 +261,12 @@ 
 	 * @param boolean $dropdown
 	 */
 	public function asDropdown($dropdown) {
-		if ($dropdown === false) {
-			$this->_template = include dirname(__FILE__) . '/../templates/tplDropdownMenu.php';
-			$dropdown = "menu";
+		if ($dropdown===false) {
+			$this->_template=include dirname(__FILE__).'/../templates/tplDropdownMenu.php';
+			$dropdown="menu";
 		} else {
-			$dropdown = "dropdown";
-			$this->mClass = "menu";
+			$dropdown="dropdown";
+			$this->mClass="menu";
 		}
 		return $this->addToPropertyCtrl("class", $dropdown, array(
 			"menu",
@@ -292,7 +292,7 @@ 
 		));
 	}
 
-	public function asButton($floating = false) {
+	public function asButton($floating=false) {
 		$this->removeArrow();
 		if ($floating)
 			$this->addToProperty("class", "floating");
@@ -300,15 +300,15 @@ 
 		return $this->addToProperty("class", "button");
 	}
 
-	public function asSelect($name = NULL, $multiple = false, $selection = true) {
-		$this->_multiple = $multiple;
+	public function asSelect($name=NULL, $multiple=false, $selection=true) {
+		$this->_multiple=$multiple;
 		if (isset($name))
 			$this->addInput($name);
 		if ($multiple) {
 			$this->addToProperty("class", "multiple");
 		}
 		if ($selection) {
-			if ($this->propertyContains("class", "button") === false)
+			if ($this->propertyContains("class", "button")===false)
 				$this->addToPropertyCtrl("class", "selection", array(
 					"selection"
 				));
@@ -316,31 +316,31 @@ 
 		return $this;
 	}
 
-	public function asSearch($name = NULL, $multiple = false, $selection = true) {
+	public function asSearch($name=NULL, $multiple=false, $selection=true) {
 		$this->asSelect($name, $multiple, $selection);
 		return $this->addToProperty("class", "search");
 	}
 
-	public function setSelect($name = NULL, $multiple = false) {
-		$this->_template = '<%tagName% id="%identifier%" %properties%>%items%</%tagName%>';
-		if (! isset($name))
-			$name = "select-" . $this->identifier;
-		$this->input = null;
+	public function setSelect($name=NULL, $multiple=false) {
+		$this->_template='<%tagName% id="%identifier%" %properties%>%items%</%tagName%>';
+		if (!isset($name))
+			$name="select-".$this->identifier;
+		$this->input=null;
 		if ($multiple) {
 			$this->setProperty("multiple", true);
 			$this->addToProperty("class", "multiple");
 		}
 		$this->setAction("activate");
-		$this->tagName = "select";
+		$this->tagName="select";
 		$this->setProperty("name", $name);
-		$this->content = null;
+		$this->content=null;
 		foreach ($this->items as $item) {
 			$item->asOption();
 		}
 		return $this;
 	}
 
-	public function asSubmenu($pointing = NULL) {
+	public function asSubmenu($pointing=NULL) {
 		$this->setClass("ui dropdown link item");
 		if (isset($pointing)) {
 			$this->setPointing($pointing);
@@ -348,29 +348,29 @@ 
 		return $this;
 	}
 
-	public function setPointing($value = Direction::NONE) {
-		return $this->addToPropertyCtrl("class", $value . " pointing", Direction::getConstantValues("pointing"));
+	public function setPointing($value=Direction::NONE) {
+		return $this->addToPropertyCtrl("class", $value." pointing", Direction::getConstantValues("pointing"));
 	}
 
 	public function setValue($value) {
-		$this->value = $value;
+		$this->value=$value;
 		return $this;
 	}
 
 	public function setDefaultText($text) {
-		$this->content["text"] = new HtmlSemDoubleElement("", "div", "default text", $text);
+		$this->content["text"]=new HtmlSemDoubleElement("", "div", "default text", $text);
 		return $this;
 	}
 
 	private function applyValue() {
-		$value = $this->value;
+		$value=$this->value;
 		if (isset($this->input) && isset($value)) {
 			$this->input->setProperty("value", $value);
 		} else {
 			$this->setProperty("value", $value);
 		}
-		$textElement = $this->getElementById("text-" . $this->identifier, $this->content);
-		if (isset($textElement) && ($textElement instanceof HtmlDoubleElement) && ! $this->_multiple)
+		$textElement=$this->getElementById("text-".$this->identifier, $this->content);
+		if (isset($textElement) && ($textElement instanceof HtmlDoubleElement) && !$this->_multiple)
 			$textElement->setContent($value);
 		return $this;
 	}
@@ -380,9 +380,9 @@ 
 	 * @see BaseHtml::run()
 	 */
 	public function run(JsUtils $js) {
-		if ($this->propertyContains("class", "simple") === false) {
-			if (isset($this->_bsComponent) === false) {
-				$this->_bsComponent = $js->semantic()->dropdown("#" . $this->identifier, $this->_params);
+		if ($this->propertyContains("class", "simple")===false) {
+			if (isset($this->_bsComponent)===false) {
+				$this->_bsComponent=$js->semantic()->dropdown("#".$this->identifier, $this->_params);
 				$this->_bsComponent->setItemSelector(".item");
 			}
 			$this->addEventsOnRun($js);
@@ -397,31 +397,31 @@ 
 	}
 
 	public function setAction($action) {
-		$this->_params["action"] = $action;
+		$this->_params["action"]=$action;
 		return $this;
 	}
 
 	public function setOn($on) {
-		$this->_params["on"] = $on;
+		$this->_params["on"]=$on;
 		return $this;
 	}
 
 	public function setShowOnFocus($value) {
-		$this->_params["showOnFocus"] = $value;
+		$this->_params["showOnFocus"]=$value;
 		return $this;
 	}
 
 	public function setAllowAdditions($value) {
-		$this->_params["allowAdditions"] = $value;
+		$this->_params["allowAdditions"]=$value;
 		return $this;
 	}
 
 	public function setFullTextSearch($value) {
-		$this->_params["fullTextSearch"] = $value;
+		$this->_params["fullTextSearch"]=$value;
 		return $this;
 	}
 
-	public function compile(JsUtils $js = NULL, &$view = NULL) {
+	public function compile(JsUtils $js=NULL, &$view=NULL) {
 		$this->applyValue();
 		return parent::compile($js, $view);
 	}
@@ -430,19 +430,19 @@ 
 		return $this->input;
 	}
 
-	public function setIcon($icon = "dropdown") {
-		$this->content["arrow"] = new HtmlIcon($this->identifier . "-icon", $icon);
+	public function setIcon($icon="dropdown") {
+		$this->content["arrow"]=new HtmlIcon($this->identifier."-icon", $icon);
 		return $this;
 	}
 
-	public function jsAddItem($caption, $value = null) {
-		$value = $value ?? $caption;
-		$js = "var first=$('#{$this->identifier} .item').first();if(first!=undefined){var newItem =first.clone();first.parent().append(newItem);newItem.html({$caption});newItem.attr('data-value',{$value}).removeClass('active filtered');}";
+	public function jsAddItem($caption, $value=null) {
+		$value=$value ?? $caption;
+		$js="var first=$('#{$this->identifier} .item').first();if(first!=undefined){var newItem =first.clone();first.parent().append(newItem);newItem.html({$caption});newItem.attr('data-value',{$value}).removeClass('active filtered');}";
 		return $js;
 	}
 
 	public function setClearable($value) {
-		$this->_params["clearable"] = $value;
+		$this->_params["clearable"]=$value;
 		return $this;
 	}
 
@@ -451,7 +451,7 @@ 
 	 * Parameters addedValue, addedText, $addedChoice
 	 */
 	public function setOnAdd($jsCode) {
-		$this->_params["onAdd"] = $jsCode;
+		$this->_params["onAdd"]=$jsCode;
 		return $this;
 	}
 
@@ -460,7 +460,7 @@ 
 	 * Parameters removedValue, removedText, $removedChoice
 	 */
 	public function setOnRemove($jsCode) {
-		$this->_params["onRemove"] = $jsCode;
+		$this->_params["onRemove"]=$jsCode;
 		return $this;
 	}
 }

Ajax/common/traits/JsUtilsActionsTrait.php

Spacing +180 added lines, -180 removed lines

@@ -12,7 +12,7 @@ 
  */
 trait JsUtilsActionsTrait {
 
-	abstract public function _add_event($element, $js, $event, $preventDefault = false, $stopPropagation = false, $immediatly = true, $listenerOn=false);
+	abstract public function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false, $immediatly=true, $listenerOn=false);
 
 	/**
 	 * show or hide with effect
@@ -28,15 +28,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;
 	}
 
@@ -47,14 +47,14 @@ 
 	 * @return string
 	 */
 	private function _validate_speed($speed) {
-		if (in_array ( $speed, array (
+		if (in_array($speed, array(
 				'slow',
 				'normal',
 				'fast'
-		) )) {
-			$speed = '"' . $speed . '"';
-		} elseif (preg_match ( "/[^0-9]/", $speed )) {
-			$speed = '';
+		))) {
+			$speed='"'.$speed.'"';
+		} elseif (preg_match("/[^0-9]/", $speed)) {
+			$speed='';
 		}
 
 		return $speed;
@@ -69,15 +69,15 @@ 
 	 * @param boolean $immediatly
 	 *        	delayed if false
 	 */
-	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});";
+	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});";
 		} else
-			$str = "$({$element}).{$jQueryCall}();";
+			$str="$({$element}).{$jQueryCall}();";
 		if ($immediatly)
-			$this->jquery_code_for_compile [] = $str;
+			$this->jquery_code_for_compile []=$str;
 		return $str;
 	}
 
@@ -91,12 +91,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;
 	}
 
@@ -110,8 +110,8 @@ 
 	 *        	defers the execution if set to false
 	 * @return string
 	 */
-	public function addClass($element = 'this', $class = '', $immediatly = false) {
-		return $this->_genericCallValue ( 'addClass', $element, $class, $immediatly );
+	public function addClass($element='this', $class='', $immediatly=false) {
+		return $this->_genericCallValue('addClass', $element, $class, $immediatly);
 	}
 
 	/**
@@ -123,8 +123,8 @@ 
 	 *        	defers the execution if set to false
 	 * @return string
 	 */
-	public function after($to, $element, $immediatly = false) {
-		return $this->_genericCallElement ( 'after', $to, $element, $immediatly );
+	public function after($to, $element, $immediatly=false) {
+		return $this->_genericCallElement('after', $to, $element, $immediatly);
 	}
 
 	/**
@@ -136,8 +136,8 @@ 
 	 *        	defers the execution if set to false
 	 * @return string
 	 */
-	public function before($to, $element, $immediatly = false) {
-		return $this->_genericCallElement ( 'before', $to, $element, $immediatly );
+	public function before($to, $element, $immediatly=false) {
+		return $this->_genericCallElement('before', $to, $element, $immediatly);
 	}
 
 	/**
@@ -149,15 +149,15 @@ 
 	 * @param boolean $immediatly
 	 *        	delayed if false
 	 */
-	public function attr($element = 'this', $attributeName = 'id', $value = "", $immediatly = false) {
-		$element = Javascript::prep_element ( $element );
-		if (isset ( $value )) {
-			$value = Javascript::prep_value ( $value );
-			$str = "$({$element}).attr(\"$attributeName\",{$value});";
+	public function attr($element='this', $attributeName='id', $value="", $immediatly=false) {
+		$element=Javascript::prep_element($element);
+		if (isset ($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;
 	}
 
@@ -169,8 +169,8 @@ 
 	 * @param boolean $immediatly
 	 *        	defers the execution if set to false
 	 */
-	public function val($element = 'this', $value = '', $immediatly = false) {
-		return $this->_genericCallValue ( 'val', $element, $value, $immediatly );
+	public function val($element='this', $value='', $immediatly=false) {
+		return $this->_genericCallValue('val', $element, $value, $immediatly);
 	}
 
 	/**
@@ -181,8 +181,8 @@ 
 	 * @param boolean $immediatly
 	 *        	defers the execution if set to false
 	 */
-	public function html($element = 'this', $value = '', $immediatly = false) {
-		return $this->_genericCallValue ( 'html', $element, $value, $immediatly );
+	public function html($element='this', $value='', $immediatly=false) {
+		return $this->_genericCallValue('html', $element, $value, $immediatly);
 	}
 
 	/**
@@ -198,30 +198,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";
-		if (\is_array ( $params )) {
-			foreach ( $params as $param => $value ) {
-				$animations .= $param . ': \'' . $value . '\', ';
+		$animations="\t\t\t";
+		if (\is_array($params)) {
+			foreach ($params as $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;
 	}
 
@@ -234,8 +234,8 @@ 
 	 *        	defers the execution if set to false
 	 * @return string
 	 */
-	public function append($to, $element, $immediatly = false) {
-		return $this->_genericCallElement ( 'append', $to, $element, $immediatly );
+	public function append($to, $element, $immediatly=false) {
+		return $this->_genericCallElement('append', $to, $element, $immediatly);
 	}
 
 	/**
@@ -247,8 +247,8 @@ 
 	 *        	defers the execution if set to false
 	 * @return string
 	 */
-	public function prepend($to, $element, $immediatly = false) {
-		return $this->_genericCallElement ( 'prepend', $to, $element, $immediatly );
+	public function prepend($to, $element, $immediatly=false) {
+		return $this->_genericCallElement('prepend', $to, $element, $immediatly);
 	}
 
 	/**
@@ -264,8 +264,8 @@ 
 	 *        	defers the execution if set to false
 	 * @return string
 	 */
-	public function fadeIn($element = 'this', $speed = '', $callback = '', $immediatly = false) {
-		return $this->_showHideWithEffect ( "fadeIn", $element, $speed, $callback, $immediatly );
+	public function fadeIn($element='this', $speed='', $callback='', $immediatly=false) {
+		return $this->_showHideWithEffect("fadeIn", $element, $speed, $callback, $immediatly);
 	}
 
 	/**
@@ -281,8 +281,8 @@ 
 	 *        	defers the execution if set to false
 	 * @return string
 	 */
-	public function fadeOut($element = 'this', $speed = '', $callback = '', $immediatly = false) {
-		return $this->_showHideWithEffect ( "fadeOut", $element, $speed, $callback, $immediatly );
+	public function fadeOut($element='this', $speed='', $callback='', $immediatly=false) {
+		return $this->_showHideWithEffect("fadeOut", $element, $speed, $callback, $immediatly);
 	}
 
 	/**
@@ -298,8 +298,8 @@ 
 	 *        	defers the execution if set to false
 	 * @return string
 	 */
-	public function slideUp($element = 'this', $speed = '', $callback = '', $immediatly = false) {
-		return $this->_showHideWithEffect ( "slideUp", $element, $speed, $callback, $immediatly );
+	public function slideUp($element='this', $speed='', $callback='', $immediatly=false) {
+		return $this->_showHideWithEffect("slideUp", $element, $speed, $callback, $immediatly);
 	}
 
 	/**
@@ -313,8 +313,8 @@ 
 	 *        	defers the execution if set to false
 	 * @return string
 	 */
-	public function removeClass($element = 'this', $class = '', $immediatly = false) {
-		return $this->_genericCallValue ( 'removeClass', $element, $class, $immediatly );
+	public function removeClass($element='this', $class='', $immediatly=false) {
+		return $this->_genericCallValue('removeClass', $element, $class, $immediatly);
 	}
 
 	/**
@@ -330,8 +330,8 @@ 
 	 *        	defers the execution if set to false
 	 * @return string
 	 */
-	public function slideDown($element = 'this', $speed = '', $callback = '', $immediatly = false) {
-		return $this->_showHideWithEffect ( "slideDown", $element, $speed, $callback, $immediatly );
+	public function slideDown($element='this', $speed='', $callback='', $immediatly=false) {
+		return $this->_showHideWithEffect("slideDown", $element, $speed, $callback, $immediatly);
 	}
 
 	/**
@@ -347,8 +347,8 @@ 
 	 *        	defers the execution if set to false
 	 * @return string
 	 */
-	public function slideToggle($element = 'this', $speed = '', $callback = '', $immediatly = false) {
-		return $this->_showHideWithEffect ( "slideToggle", $element, $speed, $callback, $immediatly );
+	public function slideToggle($element='this', $speed='', $callback='', $immediatly=false) {
+		return $this->_showHideWithEffect("slideToggle", $element, $speed, $callback, $immediatly);
 	}
 
 	/**
@@ -364,8 +364,8 @@ 
 	 *        	defers the execution if set to false
 	 * @return string
 	 */
-	public function hide($element = 'this', $speed = '', $callback = '', $immediatly = false) {
-		return $this->_showHideWithEffect ( "hide", $element, $speed, $callback, $immediatly );
+	public function hide($element='this', $speed='', $callback='', $immediatly=false) {
+		return $this->_showHideWithEffect("hide", $element, $speed, $callback, $immediatly);
 	}
 
 	/**
@@ -381,8 +381,8 @@ 
 	 *        	defers the execution if set to false
 	 * @return string
 	 */
-	public function toggle($element = 'this', $speed = '', $callback = '', $immediatly = false) {
-		return $this->_showHideWithEffect ( "toggle", $element, $speed, $callback, $immediatly );
+	public function toggle($element='this', $speed='', $callback='', $immediatly=false) {
+		return $this->_showHideWithEffect("toggle", $element, $speed, $callback, $immediatly);
 	}
 
 	/**
@@ -395,8 +395,8 @@ 
 	 *        	defers the execution if set to false
 	 * @return string
 	 */
-	public function toggleClass($element = 'this', $class = '', $immediatly = false) {
-		return $this->_genericCallValue ( 'toggleClass', $element, $class, $immediatly );
+	public function toggleClass($element='this', $class='', $immediatly=false) {
+		return $this->_genericCallValue('toggleClass', $element, $class, $immediatly);
 	}
 
 	/**
@@ -407,12 +407,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;
 	}
 
@@ -429,8 +429,8 @@ 
 	 *        	defers the execution if set to false
 	 * @return string
 	 */
-	public function show($element = 'this', $speed = '', $callback = '', $immediatly = false) {
-		return $this->_showHideWithEffect ( "show", $element, $speed, $callback, $immediatly );
+	public function show($element='this', $speed='', $callback='', $immediatly=false) {
+		return $this->_showHideWithEffect("show", $element, $speed, $callback, $immediatly);
 	}
 
 	/**
@@ -440,18 +440,18 @@ 
 	 * @param array $options
 	 * @return string
 	 */
-	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 . "";
+	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 = 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});";
 	}
 
 	/**
@@ -463,8 +463,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";
 	}
 
 	/**
@@ -476,14 +476,14 @@ 
 	 * @param boolean $immediatly
 	 *        	defers the execution if set to false
 	 */
-	public function condition($condition, $jsCodeIfTrue, $jsCodeIfFalse = null, $immediatly = false) {
-		$str = "if(" . $condition . "){" . $jsCodeIfTrue . "}";
-		if (isset ( $jsCodeIfFalse )) {
-			$str .= "else{" . $jsCodeIfFalse . "}";
+	public function condition($condition, $jsCodeIfTrue, $jsCodeIfFalse=null, $immediatly=false) {
+		$str="if(".$condition."){".$jsCodeIfTrue."}";
+		if (isset ($jsCodeIfFalse)) {
+			$str.="else{".$jsCodeIfFalse."}";
 		}
 
 		if ($immediatly)
-			$this->jquery_code_for_compile [] = $str;
+			$this->jquery_code_for_compile []=$str;
 		return $str;
 	}
 
@@ -498,14 +498,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;
 	}
 
@@ -522,8 +522,8 @@ 
 	 *        	javascript code to execute after the jquery call
 	 * @return mixed
 	 */
-	public function doJQuery($element, $jqueryCall, $param = "", $jsCallback = "") {
-		return $this->_doJQuery ( $element, $jqueryCall, $param, $jsCallback, true );
+	public function doJQuery($element, $jqueryCall, $param="", $jsCallback="") {
+		return $this->_doJQuery($element, $jqueryCall, $param, $jsCallback, true);
 	}
 
 	/**
@@ -539,8 +539,8 @@ 
 	 *        	javascript code to execute after the jquery call
 	 * @return mixed
 	 */
-	public function doJQueryDeferred($element, $jqueryCall, $param = "", $jsCallback = "") {
-		return $this->_doJQuery ( $element, $jqueryCall, $param, $jsCallback, false );
+	public function doJQueryDeferred($element, $jqueryCall, $param="", $jsCallback="") {
+		return $this->_doJQuery($element, $jqueryCall, $param, $jsCallback, false);
 	}
 
 	/**
@@ -557,8 +557,8 @@ 
 	 * @param boolean $immediatly
 	 * @return string
 	 */
-	private function _doJQueryOn($event, $element, $elementToModify, $jqueryCall, $param = "", $preventDefault = false, $stopPropagation = false, $jsCallback = "", $immediatly = true) {
-		return $this->_add_event ( $element, $this->_doJQuery ( $elementToModify, $jqueryCall, $param, $jsCallback ), $event, $preventDefault, $stopPropagation, $immediatly );
+	private function _doJQueryOn($event, $element, $elementToModify, $jqueryCall, $param="", $preventDefault=false, $stopPropagation=false, $jsCallback="", $immediatly=true) {
+		return $this->_add_event($element, $this->_doJQuery($elementToModify, $jqueryCall, $param, $jsCallback), $event, $preventDefault, $stopPropagation, $immediatly);
 	}
 
 	/**
@@ -572,13 +572,13 @@ 
 	 * @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;
-		extract ( $parameters );
-		return $this->_doJQueryOn ( $event, $element, $elementToModify, $jqueryCall, $param, $preventDefault, $stopPropagation, $jsCallback, $immediatly );
+	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);
 	}
 
 	/**
@@ -590,10 +590,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;
 	}
 
@@ -607,8 +607,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;
 	}
 
@@ -623,18 +623,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;
-		extract ( $parameters );
-		$script = $this->_add_event ( $element, $this->exec ( $js ), $event, $preventDefault, $stopPropagation, $immediatly );
+	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);
 		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";
-		return $this->exec ( $retour, $immediatly );
+	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;
-		extract ( $parameters );
-		$script = $this->_add_event ( $element, Javascript::draggable ( $attr ), "dragstart", $preventDefault, $stopPropagation, $immediatly );
+	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);
 		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 );
-		extract ( $parameters );
-		$script .= $this->_add_event ( $element, Javascript::dropZone ( $jqueryDone, $jsCallback ), "drop", 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);
 		return $script;
 	}
 
@@ -688,16 +688,16 @@ 
 	 *        	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});";
+		if (isset ($globalName)) {
+			$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 );
+		return $this->exec($script, $immediatly);
 	}
 
 	/**
@@ -709,8 +709,8 @@ 
 	 *        	delayed if false
 	 * @return string
 	 */
-	public function clearInterval($globalName, $immediatly = true) {
-		return $this->exec ( "if(window.{$globalName}){clearInterval(window.{$globalName});}", $immediatly );
+	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 = "";
-		if (isset ( $globalName )) {
-			$global = "\nwindow.{$globalName}=interval;";
+		$global="";
+		if (isset ($globalName)) {
+			$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,8 +787,8 @@ 
 	 *        	count down if true or elapse if false
 	 * @return string
 	 */
-	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 ) );
+	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,8 +802,8 @@ 
 	 *        	the active href (if null, window.location.href is used)
 	 * @return string
 	 */
-	public function activateLink($target, $property = 'href', $href = null) {
-		return $this->execAtLast ( $this->_activateLink ( $target, $property, $href ) );
+	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");';
-		if (isset ( $href )) {
-			$js .= 'var href="' . $href . '";';
+	public function _activateLink($target, $property='href', $href=null) {
+		$js='$("'.$target.' ['.$property.']").removeClass("active");';
+		if (isset ($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;
 	}
 }