phpMv / phpMv-UI

Ajax/common/traits/JsUtilsActionsTrait.php

Spacing +134 added lines, -134 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,10 +645,10 @@ 
 	 * @param array $parameters
 	 *        	default : array("attr"=>"id","preventDefault"=>false,"stopPropagation"=>false,"immediatly"=>true)
 	 */
-	public function setDraggable($element, $parameters = []) {
-		$attr = "id";
+	public function setDraggable($element, $parameters=[]) {
+		$attr="id";
 		extract($parameters);
-		$script = $this->_add_event($element, Javascript::draggable($attr), "dragstart", $parameters);
+		$script=$this->_add_event($element, Javascript::draggable($attr), "dragstart", $parameters);
 		return $script;
 	}
 
@@ -662,13 +662,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;
 	}
 
@@ -685,14 +685,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);
 	}
@@ -706,7 +706,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);
 	}
 
@@ -728,20 +728,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, minutes, seconds;
+		$timer="var startTimer=function(duration, display) {var timer = duration, minutes, seconds;
 											display.trigger('counter-start',timer);
 											display.show();
     										var interval=setInterval(function () {
@@ -749,12 +749,12 @@ 
 										        minutes = minutes < 10 ? '0' + minutes : minutes;
         										seconds = seconds < 10 ? '0' + seconds : seconds;
 										        if(display.is('[value]')){display.val(minutes + ':' + seconds);} else {display.html(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);
 	}
 
 	/**
@@ -776,7 +776,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));
 	}
 
@@ -791,14 +791,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;
 	}
 }

Braces +36 added lines, -24 removed lines

@@ -34,8 +34,9 @@ 
 			$callback = ", function(){\n{$callback}\n}";
 		}
 		$str = "$({$element}).{$action}({$speed}{$callback});";
-		if ($immediatly)
-			$this->jquery_code_for_compile[] = $str;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[] = $str;
+		}
 		return $str;
 	}
 
@@ -73,10 +74,12 @@ 
 		if (isset($param)) {
 			$param = Javascript::prep_value($param);
 			$str = "$({$element}).{$jQueryCall}({$param});";
-		} else
-			$str = "$({$element}).{$jQueryCall}();";
-		if ($immediatly)
-			$this->jquery_code_for_compile[] = $str;
+		} else {
+					$str = "$({$element}).{$jQueryCall}();";
+		}
+		if ($immediatly) {
+					$this->jquery_code_for_compile[] = $str;
+		}
 		return $str;
 	}
 
@@ -94,8 +97,9 @@ 
 		$to = Javascript::prep_element($to);
 		$element = Javascript::prep_element($element);
 		$str = "$({$to}).{$jQueryCall}({$element});";
-		if ($immediatly)
-			$this->jquery_code_for_compile[] = $str;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[] = $str;
+		}
 		return $str;
 	}
 
@@ -153,10 +157,12 @@ 
 		if (isset($value)) {
 			$value = Javascript::prep_value($value);
 			$str = "$({$element}).attr(\"$attributeName\",{$value});";
-		} else
-			$str = "$({$element}).attr(\"$attributeName\");";
-		if ($immediatly)
-			$this->jquery_code_for_compile[] = $str;
+		} else {
+					$str = "$({$element}).attr(\"$attributeName\");";
+		}
+		if ($immediatly) {
+					$this->jquery_code_for_compile[] = $str;
+		}
 		return $str;
 	}
 
@@ -219,8 +225,9 @@ 
 
 		$str = "$({$element}).animate({\n$animations\n\t\t}" . $speed . $extra . ");";
 
-		if ($immediatly)
-			$this->jquery_code_for_compile[] = $str;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[] = $str;
+		}
 		return $str;
 	}
 
@@ -410,8 +417,9 @@ 
 		$element = Javascript::prep_element($element);
 		$str = "$({$element}).trigger(\"$event\");";
 
-		if ($immediatly)
-			$this->jquery_code_for_compile[] = $str;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[] = $str;
+		}
 		return $str;
 	}
 
@@ -481,8 +489,9 @@ 
 			$str .= "else{" . $jsCodeIfFalse . "}";
 		}
 
-		if ($immediatly)
-			$this->jquery_code_for_compile[] = $str;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[] = $str;
+		}
 		return $str;
 	}
 
@@ -500,11 +509,13 @@ 
 	private function _doJQuery($element, $jqueryCall, $param = "", $jsCallback = "", $immediatly = false) {
 		$param = Javascript::prep_value($param);
 		$callback = "";
-		if ($jsCallback != "")
-			$callback = ", function(event){\n{$jsCallback}\n}";
+		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;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[] = $script;
+		}
 		return $script;
 	}
 
@@ -591,8 +602,9 @@ 
 	 */
 	public function exec($js, $immediatly = false) {
 		$script = $js . "\n";
-		if ($immediatly)
-			$this->jquery_code_for_compile[] = $script;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[] = $script;
+		}
 		return $script;
 	}