Inspection of "Merge pull request #2 from aleboisselier/master" - jcheron/phalcon-jquery - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( c831e1...10d75a )

by Jean-Christophe

created 2015-12-03 10:47 UTC

Status

Spacing +59 added lines, -59 removed lines patch added patch discarded remove patch

@@ -21,14 +21,14 @@  discard block
 block discarded – undo
 	protected $_bootstrap;
 	protected $libraryFile;
 	protected $_javascript_folder='js';
-	protected $jquery_code_for_load=array ();
-	protected $jquery_code_for_compile=array ();
+	protected $jquery_code_for_load=array();
+	protected $jquery_code_for_compile=array();
 	protected $jquery_corner_active=FALSE;
 	protected $jquery_table_sorter_active=FALSE;
 	protected $jquery_table_sorter_pager_active=FALSE;
 	protected $ajaxLoader='<span></span><span></span><span></span><span></span><span></span>';
-	protected $jquery_events=array (
-			"bind","blur","change","click","dblclick","delegate","die","error","focus","focusin","focusout","hover","keydown","keypress","keyup","live","load","mousedown","mousseenter","mouseleave","mousemove","mouseout","mouseover","mouseup","off","on","one","ready","resize","scroll","select","submit","toggle","trigger","triggerHandler","undind","undelegate","unload"
+	protected $jquery_events=array(
+			"bind", "blur", "change", "click", "dblclick", "delegate", "die", "error", "focus", "focusin", "focusout", "hover", "keydown", "keypress", "keyup", "live", "load", "mousedown", "mousseenter", "mouseleave", "mousemove", "mouseout", "mouseover", "mouseup", "off", "on", "one", "ready", "resize", "scroll", "select", "submit", "toggle", "trigger", "triggerHandler", "undind", "undelegate", "unload"
 	);
 
 	public function setDi($di) {
@@ -161,7 +161,7 @@  discard block
 block discarded – undo
 	 */
 	public function _click($element='this', $js=array(), $ret_false=TRUE) {
 		if (!is_array($js)) {
-			$js=array (
+			$js=array(
 					$js
 			);
 		}
@@ -356,12 +356,12 @@  discard block
 block discarded – undo
 	 */
 	public function _output($array_js='') {
 		if (!is_array($array_js)) {
-			$array_js=array (
+			$array_js=array(
 					$array_js
 			);
 		}
 
-		foreach ( $array_js as $js ) {
+		foreach ($array_js as $js) {
 			$this->jquery_code_for_compile[]="\t$js\n";
 		}
 	}
@@ -416,7 +416,7 @@  discard block
 block discarded – undo
 	 * @param boolean $immediatly defers the execution if set to false
 	 * @return string
 	 */
-	public function after($element='this', $value='', $immediatly=false){
+	public function after($element='this', $value='', $immediatly=false) {
 		$element=$this->_prep_element($element);
 		$value=$this->_prep_value($value);
 		$str="$({$element}).after({$value});";
@@ -437,7 +437,7 @@  discard block
 block discarded – undo
 		if (isset($value)) {
 			$value=$this->_prep_value($value);
 			$str="$({$element}).attr(\"$attributeName\",{$value});";
-		} else
+		}else
 			$str="$({$element}).attr(\"$attributeName\");";
 		if ($immediatly)
 			$this->jquery_code_for_compile[]=$str;
@@ -451,12 +451,12 @@  discard block
 block discarded – undo
 	 * @param string $param
 	 * @param boolean $immediatly delayed if false
 	 */
-	public function _genericCallValue($jQueryCall,$element='this', $param="", $immediatly=false) {
+	public function _genericCallValue($jQueryCall, $element='this', $param="", $immediatly=false) {
 		$element=$this->_prep_element($element);
 		if (isset($param)) {
 			$param=$this->_prep_value($param);
 			$str="$({$element}).{$jQueryCall}({$param});";
-		} else
+		}else
 			$str="$({$element}).{$jQueryCall}();";
 			if ($immediatly)
 				$this->jquery_code_for_compile[]=$str;
@@ -470,7 +470,7 @@  discard block
 block discarded – undo
 	 * @param boolean $immediatly delayed if false
 	 * @return string
 	 */
-	public function _genericCallElement($jQueryCall,$to='this', $element, $immediatly=false) {
+	public function _genericCallElement($jQueryCall, $to='this', $element, $immediatly=false) {
 		$to=$this->_prep_element($to);
 		$element=$this->_prep_element($element);
 		$str="$({$to}).{$jQueryCall}({$element});";
@@ -496,7 +496,7 @@  discard block
 block discarded – undo
 
 		$animations="\t\t\t";
 		if (is_array($params)) {
-			foreach ( $params as $param => $value ) {
+			foreach ($params as $param => $value) {
 				$animations.=$param.': \''.$value.'\', ';
 			}
 		}
@@ -768,12 +768,12 @@  discard block
 block discarded – undo
 	 */
 	public function sortable($element, $options=array()) {
 		if (count($options)>0) {
-			$sort_options=array ();
-			foreach ( $options as $k => $v ) {
+			$sort_options=array();
+			foreach ($options as $k => $v) {
 				$sort_options[]="\n\t\t".$k.': '.$v."";
 			}
 			$sort_options=implode(",", $sort_options);
-		} else {
+		}else {
 			$sort_options='';
 		}
 
@@ -854,7 +854,7 @@  discard block
 block discarded – undo
 
 		// External references
 		$external_scripts=implode('', $this->jquery_code_for_load);
-		extract(array (
+		extract(array(
 				'library_src' => $external_scripts
 		));
 
@@ -887,7 +887,7 @@  discard block
 block discarded – undo
 	 * @return void
 	 */
 	public function _clear_compile() {
-		$this->jquery_code_for_compile=array ();
+		$this->jquery_code_for_compile=array();
 	}
 
 	// --------------------------------------------------------------------
@@ -899,12 +899,12 @@  discard block
 block discarded – undo
 	 */
 	public function _document_ready($js) {
 		if (!is_array($js)) {
-			$js=array (
+			$js=array(
 					$js
 			);
 		}
 
-		foreach ( $js as $script ) {
+		foreach ($js as $script) {
 			$this->jquery_code_for_compile[]=$script;
 		}
 	}
@@ -920,7 +920,7 @@  discard block
 block discarded – undo
 	 * @return string
 	 */
 	public function _prep_element($element) {
-		if (strrpos($element, 'this')===false&&strrpos($element, 'event')===false&&strrpos($element, 'self')===false) {
+		if (strrpos($element, 'this')===false && strrpos($element, 'event')===false && strrpos($element, 'self')===false) {
 			$element='"'.addslashes($element).'"';
 		}
 		return $element;
@@ -938,7 +938,7 @@  discard block
 block discarded – undo
 		if (is_array($value)) {
 			$value=implode(",", $value);
 		}
-		if (strrpos($value, 'this')===false&&strrpos($value, 'event')===false&&strrpos($value, 'self')===false) {
+		if (strrpos($value, 'this')===false && strrpos($value, 'event')===false && strrpos($value, 'self')===false) {
 			$value='"'.$value.'"';
 		}
 		return $value;
@@ -953,8 +953,8 @@  discard block
 block discarded – undo
 	 * @return string
 	 */
 	private function _validate_speed($speed) {
-		if (in_array($speed, array (
-				'slow','normal','fast'
+		if (in_array($speed, array(
+				'slow', 'normal', 'fast'
 		))) {
 			$speed='"'.$speed.'"';
 		} elseif (preg_match("/[^0-9]/", $speed)) {
@@ -968,7 +968,7 @@  discard block
 block discarded – undo
 		$loading_notifier='<div class="ajax-loader">';
 		if ($this->ajaxLoader=='') {
 			$loading_notifier.="Loading...";
-		} else {
+		}else {
 			$loading_notifier.=$this->ajaxLoader;
 		}
 		$loading_notifier.='</div>';
@@ -976,20 +976,20 @@  discard block
 block discarded – undo
 		$retour.="\t\t$({$responseElement}).prepend('{$loading_notifier}');\n";
 	}
 
-	public function _get($url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true,$immediatly=false) {
-		return $this->_ajax("get", $url,$params,$responseElement,$jsCallback,$attr,$hasLoader,$immediatly);
+	public function _get($url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true, $immediatly=false) {
+		return $this->_ajax("get", $url, $params, $responseElement, $jsCallback, $attr, $hasLoader, $immediatly);
 	}
-	public function _post($url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true,$immediatly=false) {
-		return $this->_ajax("post", $url,$params,$responseElement,$jsCallback,$attr,$hasLoader,$immediatly);
+	public function _post($url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true, $immediatly=false) {
+		return $this->_ajax("post", $url, $params, $responseElement, $jsCallback, $attr, $hasLoader, $immediatly);
 	}
 
-	protected function _ajax($method,$url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true,$immediatly=false) {
-		if(JString::isNull($params)){$params="{}";}
+	protected function _ajax($method, $url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true, $immediatly=false) {
+		if (JString::isNull($params)) {$params="{}"; }
 		$jsCallback=isset($jsCallback) ? $jsCallback : "";
 		$retour=$this->_getAjaxUrl($url, $attr);
 		$responseElement=$this->_getResponseElement($responseElement);
 		$retour.="var self=this;\n";
-		if($hasLoader===true){
+		if ($hasLoader===true) {
 			$this->addLoading($retour, $responseElement);
 		}
 		$retour.="$.".$method."(url,".$params.").done(function( data ) {\n";
@@ -999,22 +999,22 @@  discard block
 block discarded – undo
 		return $retour;
 	}
 
-	protected function _getAjaxUrl($url,$attr){
+	protected function _getAjaxUrl($url, $attr) {
 		$url=$this->_correctAjaxUrl($url);
 		$retour="url='".$url."';\n";
 		$slash="/";
-		if(PhalconUtils::endsWith($url, "/"))
+		if (PhalconUtils::endsWith($url, "/"))
 			$slash="";
-		if(JString::isNotNull($attr)){
+		if (JString::isNotNull($attr)) {
 			if ($attr=="value")
 				$retour.="url=url+'".$slash."'+$(this).val();\n";
-			else if($attr!=null && $attr!=="")
+			else if ($attr!=null && $attr!=="")
 				$retour.="url=url+'".$slash."'+$(this).attr('".$attr."');\n";
 		}
 		return $retour;
 	}
 
-	protected function _getOnAjaxDone($responseElement,$jsCallback){
+	protected function _getOnAjaxDone($responseElement, $jsCallback) {
 		$retour="";
 		if ($responseElement!=="") {
 			$retour="\t$({$responseElement}).html( data );\n";
@@ -1023,7 +1023,7 @@  discard block
 block discarded – undo
 		return $retour;
 	}
 	
-	protected function _getResponseElement($responseElement){
+	protected function _getResponseElement($responseElement) {
 		if ($responseElement!=="") {
 			$responseElement=$this->_prep_value($responseElement);
 		}
@@ -1033,7 +1033,7 @@  discard block
 block discarded – undo
 	protected function _correctAjaxUrl($url) {
 		if (PhalconUtils::endsWith($url, "/"))
 			$url=substr($url, 0, strlen($url)-1);
-		if (strncmp($url, 'http://', 7)!=0&&strncmp($url, 'https://', 8)!=0) {
+		if (strncmp($url, 'http://', 7)!=0 && strncmp($url, 'https://', 8)!=0) {
 			$url=$this->_di->get("url")->get($url);
 		}
 		return $url;
@@ -1046,7 +1046,7 @@  discard block
 block discarded – undo
 	 * @param string $method Method use
 	 * @param string $jsCallback javascript code to execute after the request
 	 */
-	public function _json($url, $method="get", $params="{}", $jsCallback=NULL, $attr="id", $context="document",$immediatly=false) {
+	public function _json($url, $method="get", $params="{}", $jsCallback=NULL, $attr="id", $context="document", $immediatly=false) {
 		$jsCallback=isset($jsCallback) ? $jsCallback : "";
 		$retour=$this->_getAjaxUrl($url, $attr);
 		$retour.="$.{$method}(url,".$params.").done(function( data ) {\n";
@@ -1066,7 +1066,7 @@  discard block
 block discarded – undo
 	 * @param string $url the request address
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","params"=>"{}","method"=>"get")
 	 */
-	public function _jsonOn($event,$element, $url,$parameters=array()) {
+	public function _jsonOn($event, $element, $url, $parameters=array()) {
 		$preventDefault=true;
 		$stopPropagation=true;
 		$jsCallback=null;
@@ -1075,7 +1075,7 @@  discard block
 block discarded – undo
 		$context="document";
 		$params="{}";
 		extract($parameters);
-		return $this->_add_event($element, $this->_json($url,$method, $params,$jsCallback, $attr,$context), $event, $preventDefault, $stopPropagation);
+		return $this->_add_event($element, $this->_json($url, $method, $params, $jsCallback, $attr, $context), $event, $preventDefault, $stopPropagation);
 	}
 
 	/**
@@ -1086,19 +1086,19 @@  discard block
 block discarded – undo
 	 * @param string $jsCallback javascript code to execute after the request
 	 * @param string $context jquery DOM element, array container.
 	 */
-	public function _jsonArray($maskSelector, $url, $method="get", $params="{}", $jsCallback=NULL, $attr="id", $context=null,$immediatly=false) {
+	public function _jsonArray($maskSelector, $url, $method="get", $params="{}", $jsCallback=NULL, $attr="id", $context=null, $immediatly=false) {
 		$jsCallback=isset($jsCallback) ? $jsCallback : "";
 		$retour=$this->_getAjaxUrl($url, $attr);
-		if($context==null){
+		if ($context==null) {
 			$appendTo="\t\tnewElm.appendTo($('".$maskSelector."').parent());\n";
-			$newElm = "$('#'+newId)";
-		}else{
+			$newElm="$('#'+newId)";
+		}else {
 			$appendTo="\t\tnewElm.appendTo(".$context.");\n";
-			$newElm = $context.".find('#'+newId)";
+			$newElm=$context.".find('#'+newId)";
 		}
 		$retour.="var self = $(this);\n$.{$method}(url,".$params.").done(function( data ) {\n";
 		$retour.="\tdata=$.parseJSON(data);$.each(data, function(index, value) {\n"."\tvar created=false;var maskElm=$('".$maskSelector."').first();maskElm.hide();"."\tvar newId=(maskElm.attr('id') || 'mask')+'-'+index;"."\tvar newElm=".$newElm.";\n"."\tif(!newElm.length){\n"."\t\tnewElm=maskElm.clone();newElm.attr('id',newId);\n";
-		$retour.= $appendTo;
+		$retour.=$appendTo;
 		$retour.="\t}\n"."\tfor(var key in value){\n"."\t\t\tvar html = $('<div />').append($(newElm).clone()).html();\n"."\t\t\tif(html.indexOf('[['+key+']]')>-1){\n"."\t\t\t\tcontent=$(html.split('[['+key+']]').join(value[key]));\n"."\t\t\t\t$(newElm).replaceWith(content);newElm=content;\n"."\t\t\t}\n"."\t\tvar sel='[data-id=\"'+key+'\"]';if($(sel,newElm).length){\n"."\t\t\tvar selElm=$(sel,newElm);\n"."\t\t\t if(selElm.is('[value]')) { selElm.attr('value',value[key]);selElm.val(value[key]);} else { selElm.html(value[key]); }\n"."\t\t}\n"."}\n"."\t$(newElm).show(true);"."\n"."\t$(newElm).removeClass('hide');"."});\n";
 
 		$retour.="\t".$jsCallback."\n"."});\n";
@@ -1113,25 +1113,25 @@  discard block
 block discarded – undo
 	 * @param string $url the request address
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","params"=>"{}","method"=>"get", "context"=>null)
 	 */
-	public function _jsonArrayOn($event,$element, $maskSelector,$url,$parameters=array()) {
+	public function _jsonArrayOn($event, $element, $maskSelector, $url, $parameters=array()) {
 		$preventDefault=true;
 		$stopPropagation=true;
 		$jsCallback=null;
 		$attr="id";
 		$method="get";
-		$context = null;
+		$context=null;
 		$params="{}";
 		extract($parameters);
-		return $this->_add_event($element, $this->_jsonArray($maskSelector,$url,$method, $params,$jsCallback, $attr, $context), $event, $preventDefault, $stopPropagation);
+		return $this->_add_event($element, $this->_jsonArray($maskSelector, $url, $method, $params, $jsCallback, $attr, $context), $event, $preventDefault, $stopPropagation);
 	}
 	
-	public function _postForm($url, $form, $responseElement, $validation=false, $jsCallback=NULL, $attr="id", $hasLoader=true,$immediatly=false) {
+	public function _postForm($url, $form, $responseElement, $validation=false, $jsCallback=NULL, $attr="id", $hasLoader=true, $immediatly=false) {
 		$jsCallback=isset($jsCallback) ? $jsCallback : "";
 		$retour=$this->_getAjaxUrl($url, $attr);
 		$retour.="\nvar params=$('#".$form."').serialize();\n";
 		$responseElement=$this->_getResponseElement($responseElement);
 		$retour.="var self=this;\n";
-		if($hasLoader===true){
+		if ($hasLoader===true) {
 			$this->addLoading($retour, $responseElement);
 		}
 		$retour.="$.post(url,params).done(function( data ) {\n";
@@ -1158,14 +1158,14 @@  discard block
 block discarded – undo
 	 * @param string $responseElement
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true)
 	 */
-	public function _getOn($event,$element, $url, $params="{}", $responseElement="", $parameters=array()) {
+	public function _getOn($event, $element, $url, $params="{}", $responseElement="", $parameters=array()) {
 		$preventDefault=true;
 		$stopPropagation=true;
 		$jsCallback=null;
 		$attr="id";
 		$hasLoader=true;
 		extract($parameters);
-		return $this->_add_event($element, $this->_get($url, $params, $responseElement, $jsCallback, $attr,$hasLoader), $event, $preventDefault, $stopPropagation);
+		return $this->_add_event($element, $this->_get($url, $params, $responseElement, $jsCallback, $attr, $hasLoader), $event, $preventDefault, $stopPropagation);
 	}
 
 	/**
@@ -1178,14 +1178,14 @@  discard block
 block discarded – undo
 	 * @param string $responseElement
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true)
 	 */
-	public function _postOn($event,$element, $url, $params="{}", $responseElement="", $parameters=array()) {
+	public function _postOn($event, $element, $url, $params="{}", $responseElement="", $parameters=array()) {
 		$preventDefault=true;
 		$stopPropagation=true;
 		$jsCallback=null;
 		$attr="id";
 		$hasLoader=true;
 		extract($parameters);
-		return $this->_add_event($element, $this->_post($url, $params, $responseElement, $jsCallback, $attr,$hasLoader), $event, $preventDefault, $stopPropagation);
+		return $this->_add_event($element, $this->_post($url, $params, $responseElement, $jsCallback, $attr, $hasLoader), $event, $preventDefault, $stopPropagation);
 	}
 
 	/**
@@ -1198,7 +1198,7 @@  discard block
 block discarded – undo
 	 * @param string $responseElement
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"validation"=>false,"jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true)
 	 */
-	public function _postFormOn($event,$element, $url, $form, $responseElement="", $parameters=array()) {
+	public function _postFormOn($event, $element, $url, $form, $responseElement="", $parameters=array()) {
 		$preventDefault=true;
 		$stopPropagation=true;
 		$validation=false;
@@ -1206,7 +1206,7 @@  discard block
 block discarded – undo
 		$attr="id";
 		$hasLoader=true;
 		extract($parameters);
-		return $this->_add_event($element, $this->_postForm($url, $form, $responseElement, $validation, $jsCallback, $attr,$hasLoader), $event, $preventDefault, $stopPropagation);
+		return $this->_add_event($element, $this->_postForm($url, $form, $responseElement, $validation, $jsCallback, $attr, $hasLoader), $event, $preventDefault, $stopPropagation);
 	}
 
 	/**

Please login to merge, or discard this patch.

Braces +92 added lines, -63 removed lines patch added patch discarded remove patch

@@ -420,8 +420,9 @@  discard block
 block discarded – undo
 		$element=$this->_prep_element($element);
 		$value=$this->_prep_value($value);
 		$str="$({$element}).after({$value});";
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$str;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$str;
+		}
 		return $str;
 	}
 	
@@ -437,10 +438,12 @@  discard block
 block discarded – undo
 		if (isset($value)) {
 			$value=$this->_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;
 	}
 
@@ -456,10 +459,12 @@  discard block
 block discarded – undo
 		if (isset($param)) {
 			$param=$this->_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;
 	}
 	/**
@@ -474,8 +479,9 @@  discard block
 block discarded – undo
 		$to=$this->_prep_element($to);
 		$element=$this->_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;
 	}
 	// --------------------------------------------------------------------
@@ -512,8 +518,9 @@  discard block
 block discarded – undo
 
 		$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;
 	}
 
@@ -538,8 +545,9 @@  discard block
 block discarded – undo
 
 		$str="$({$element}).fadeIn({$speed}{$callback});";
 
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$str;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$str;
+		}
 		return $str;
 	}
 
@@ -564,8 +572,9 @@  discard block
 block discarded – undo
 
 		$str="$({$element}).fadeOut({$speed}{$callback});";
 
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$str;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$str;
+		}
 		return $str;
 	}
 
@@ -590,8 +599,9 @@  discard block
 block discarded – undo
 
 		$str="$({$element}).hide({$speed}{$callback});";
 
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$str;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$str;
+		}
 		return $str;
 	}
 
@@ -618,8 +628,9 @@  discard block
 block discarded – undo
 
 		$str="$({$element}).slideUp({$speed}{$callback});";
 
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$str;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$str;
+		}
 		return $str;
 	}
 
@@ -644,8 +655,9 @@  discard block
 block discarded – undo
 
 		$str="$({$element}).slideDown({$speed}{$callback});";
 
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$str;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$str;
+		}
 		return $str;
 	}
 
@@ -670,8 +682,9 @@  discard block
 block discarded – undo
 
 		$str="$({$element}).slideToggle({$speed}{$callback});";
 
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$str;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$str;
+		}
 		return $str;
 	}
 
@@ -688,8 +701,9 @@  discard block
 block discarded – undo
 		$element=$this->_prep_element($element);
 		$str="$({$element}).toggle();";
 
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$str;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$str;
+		}
 		return $str;
 	}
 
@@ -705,8 +719,9 @@  discard block
 block discarded – undo
 		$element=$this->_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;
 	}
 
@@ -731,8 +746,9 @@  discard block
 block discarded – undo
 
 		$str="$({$element}).show({$speed}{$callback});";
 
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$str;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$str;
+		}
 		return $str;
 	}
 
@@ -750,8 +766,9 @@  discard block
 block discarded – undo
 			$str.="else{".$jsCodeIfFalse."}";
 		}
 
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$str;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$str;
+		}
 		return $str;
 	}
 
@@ -817,10 +834,11 @@  discard block
 block discarded – undo
 		if ($stopPropagation===true) {
 			$js="event.stopPropagation();\n".$js;
 		}
-		if (array_search($event, $this->jquery_events)===false)
-			$event="\n\t$(".$this->_prep_element($element).").bind('{$event}',function(event){\n\t\t{$js}\n\t});\n";
-		else
-			$event="\n\t$(".$this->_prep_element($element).").{$event}(function(event){\n\t\t{$js}\n\t});\n";
+		if (array_search($event, $this->jquery_events)===false) {
+					$event="\n\t$(".$this->_prep_element($element).").bind('{$event}',function(event){\n\t\t{$js}\n\t});\n";
+		} else {
+					$event="\n\t$(".$this->_prep_element($element).").{$event}(function(event){\n\t\t{$js}\n\t});\n";
+		}
 		$this->jquery_code_for_compile[]=$event;
 		return $event;
 	}
@@ -870,8 +888,9 @@  discard block
 block discarded – undo
 
 		$output=($script_tags===FALSE) ? $script : $this->inline($script);
 
-		if ($view!=NULL)
-			$view->setVar($view_var, $output);
+		if ($view!=NULL) {
+					$view->setVar($view_var, $output);
+		}
 		return $output;
 	}
 
@@ -994,8 +1013,9 @@  discard block
 block discarded – undo
 		}
 		$retour.="$.".$method."(url,".$params.").done(function( data ) {\n";
 		$retour.=$this->_getOnAjaxDone($responseElement, $jsCallback)."});\n";
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$retour;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$retour;
+		}
 		return $retour;
 	}
 
@@ -1003,13 +1023,15 @@  discard block
 block discarded – undo
 		$url=$this->_correctAjaxUrl($url);
 		$retour="url='".$url."';\n";
 		$slash="/";
-		if(PhalconUtils::endsWith($url, "/"))
-			$slash="";
+		if(PhalconUtils::endsWith($url, "/")) {
+					$slash="";
+		}
 		if(JString::isNotNull($attr)){
-			if ($attr=="value")
-				$retour.="url=url+'".$slash."'+$(this).val();\n";
-			else if($attr!=null && $attr!=="")
-				$retour.="url=url+'".$slash."'+$(this).attr('".$attr."');\n";
+			if ($attr=="value") {
+							$retour.="url=url+'".$slash."'+$(this).val();\n";
+			} else if($attr!=null && $attr!=="") {
+							$retour.="url=url+'".$slash."'+$(this).attr('".$attr."');\n";
+			}
 		}
 		return $retour;
 	}
@@ -1031,8 +1053,9 @@  discard block
 block discarded – undo
 	}
 
 	protected function _correctAjaxUrl($url) {
-		if (PhalconUtils::endsWith($url, "/"))
-			$url=substr($url, 0, strlen($url)-1);
+		if (PhalconUtils::endsWith($url, "/")) {
+					$url=substr($url, 0, strlen($url)-1);
+		}
 		if (strncmp($url, 'http://', 7)!=0&&strncmp($url, 'https://', 8)!=0) {
 			$url=$this->_di->get("url")->get($url);
 		}
@@ -1054,8 +1077,9 @@  discard block
 block discarded – undo
 				."if($('#'+key,".$context.").length){ if($('#'+key,".$context.").is('[value]')) { $('#'+key,".$context.").val(data[key]);} else { $('#'+key,".$context.").html(data[key]); }}};\n";
 		$retour.="\t".$jsCallback."\n
 		});\n";
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$retour;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$retour;
+		}
 		return $retour;
 	}
 	
@@ -1092,7 +1116,7 @@  discard block
 block discarded – undo
 		if($context==null){
 			$appendTo="\t\tnewElm.appendTo($('".$maskSelector."').parent());\n";
 			$newElm = "$('#'+newId)";
-		}else{
+		} else{
 			$appendTo="\t\tnewElm.appendTo(".$context.");\n";
 			$newElm = $context.".find('#'+newId)";
 		}
@@ -1102,8 +1126,9 @@  discard block
 block discarded – undo
 		$retour.="\t}\n"."\tfor(var key in value){\n"."\t\t\tvar html = $('<div />').append($(newElm).clone()).html();\n"."\t\t\tif(html.indexOf('[['+key+']]')>-1){\n"."\t\t\t\tcontent=$(html.split('[['+key+']]').join(value[key]));\n"."\t\t\t\t$(newElm).replaceWith(content);newElm=content;\n"."\t\t\t}\n"."\t\tvar sel='[data-id=\"'+key+'\"]';if($(sel,newElm).length){\n"."\t\t\tvar selElm=$(sel,newElm);\n"."\t\t\t if(selElm.is('[value]')) { selElm.attr('value',value[key]);selElm.val(value[key]);} else { selElm.html(value[key]); }\n"."\t\t}\n"."}\n"."\t$(newElm).show(true);"."\n"."\t$(newElm).removeClass('hide');"."});\n";
 
 		$retour.="\t".$jsCallback."\n"."});\n";
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$retour;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$retour;
+		}
 		return $retour;
 	}
 	/**
@@ -1143,8 +1168,9 @@  discard block
 block discarded – undo
 			}});\n";
 			$retour.="$('#".$form."').submit();\n";
 		}
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$retour;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$retour;
+		}
 		return $retour;
 	}
 
@@ -1220,11 +1246,13 @@  discard block
 block discarded – undo
 	public function _doJQuery($element, $jqueryCall, $param="", $jsCallback="", $immediatly=false) {
 		$param=$this->_prep_value($param);
 		$callback="";
-		if ($jsCallback!="")
-			$callback=", function(event){\n{$jsCallback}\n}";
+		if ($jsCallback!="") {
+					$callback=", function(event){\n{$jsCallback}\n}";
+		}
 		$script="$(".$this->_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;
 	}
 
@@ -1252,8 +1280,9 @@  discard block
 block discarded – undo
 	 */
 	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;
 	}
 

Please login to merge, or discard this patch.

		@@ -21,14 +21,14 @@ discard block
		block discarded – undo
21	21	protected $_bootstrap;
22	22	protected $libraryFile;
23	23	protected $_javascript_folder='js';
24		- protected $jquery_code_for_load=array ();
25		- protected $jquery_code_for_compile=array ();
	24	+ protected $jquery_code_for_load=array();
	25	+ protected $jquery_code_for_compile=array();
26	26	protected $jquery_corner_active=FALSE;
27	27	protected $jquery_table_sorter_active=FALSE;
28	28	protected $jquery_table_sorter_pager_active=FALSE;
29	29	protected $ajaxLoader='<span></span><span></span><span></span><span></span><span></span>';
30		- protected $jquery_events=array (
31		- "bind","blur","change","click","dblclick","delegate","die","error","focus","focusin","focusout","hover","keydown","keypress","keyup","live","load","mousedown","mousseenter","mouseleave","mousemove","mouseout","mouseover","mouseup","off","on","one","ready","resize","scroll","select","submit","toggle","trigger","triggerHandler","undind","undelegate","unload"
	30	+ protected $jquery_events=array(
	31	+ "bind", "blur", "change", "click", "dblclick", "delegate", "die", "error", "focus", "focusin", "focusout", "hover", "keydown", "keypress", "keyup", "live", "load", "mousedown", "mousseenter", "mouseleave", "mousemove", "mouseout", "mouseover", "mouseup", "off", "on", "one", "ready", "resize", "scroll", "select", "submit", "toggle", "trigger", "triggerHandler", "undind", "undelegate", "unload"
32	32	);
33	33
34	34	public function setDi($di) {
		@@ -161,7 +161,7 @@ discard block
		block discarded – undo
161	161	*/
162	162	public function _click($element='this', $js=array(), $ret_false=TRUE) {
163	163	if (!is_array($js)) {
164		- $js=array (
	164	+ $js=array(
165	165	$js
166	166	);
167	167	}
		@@ -356,12 +356,12 @@ discard block
		block discarded – undo
356	356	*/
357	357	public function _output($array_js='') {
358	358	if (!is_array($array_js)) {
359		- $array_js=array (
	359	+ $array_js=array(
360	360	$array_js
361	361	);
362	362	}
363	363
364		- foreach ( $array_js as $js ) {
	364	+ foreach ($array_js as $js) {
365	365	$this->jquery_code_for_compile[]="\t$js\n";
366	366	}
367	367	}
		@@ -416,7 +416,7 @@ discard block
		block discarded – undo
416	416	* @param boolean $immediatly defers the execution if set to false
417	417	* @return string
418	418	*/
419		- public function after($element='this', $value='', $immediatly=false){
	419	+ public function after($element='this', $value='', $immediatly=false) {
420	420	$element=$this->_prep_element($element);
421	421	$value=$this->_prep_value($value);
422	422	$str="$({$element}).after({$value});";
		@@ -437,7 +437,7 @@ discard block
		block discarded – undo
437	437	if (isset($value)) {
438	438	$value=$this->_prep_value($value);
439	439	$str="$({$element}).attr(\"$attributeName\",{$value});";
440		- } else
	440	+ }else
441	441	$str="$({$element}).attr(\"$attributeName\");";
442	442	if ($immediatly)
443	443	$this->jquery_code_for_compile[]=$str;
		@@ -451,12 +451,12 @@ discard block
		block discarded – undo
451	451	* @param string $param
452	452	* @param boolean $immediatly delayed if false
453	453	*/
454		- public function _genericCallValue($jQueryCall,$element='this', $param="", $immediatly=false) {
	454	+ public function _genericCallValue($jQueryCall, $element='this', $param="", $immediatly=false) {
455	455	$element=$this->_prep_element($element);
456	456	if (isset($param)) {
457	457	$param=$this->_prep_value($param);
458	458	$str="$({$element}).{$jQueryCall}({$param});";
459		- } else
	459	+ }else
460	460	$str="$({$element}).{$jQueryCall}();";
461	461	if ($immediatly)
462	462	$this->jquery_code_for_compile[]=$str;
		@@ -470,7 +470,7 @@ discard block
		block discarded – undo
470	470	* @param boolean $immediatly delayed if false
471	471	* @return string
472	472	*/
473		- public function _genericCallElement($jQueryCall,$to='this', $element, $immediatly=false) {
	473	+ public function _genericCallElement($jQueryCall, $to='this', $element, $immediatly=false) {
474	474	$to=$this->_prep_element($to);
475	475	$element=$this->_prep_element($element);
476	476	$str="$({$to}).{$jQueryCall}({$element});";
		@@ -496,7 +496,7 @@ discard block
		block discarded – undo
496	496
497	497	$animations="\t\t\t";
498	498	if (is_array($params)) {
499		- foreach ( $params as $param => $value ) {
	499	+ foreach ($params as $param => $value) {
500	500	$animations.=$param.': \''.$value.'\', ';
501	501	}
502	502	}
		@@ -768,12 +768,12 @@ discard block
		block discarded – undo
768	768	*/
769	769	public function sortable($element, $options=array()) {
770	770	if (count($options)>0) {
771		- $sort_options=array ();
772		- foreach ( $options as $k => $v ) {
	771	+ $sort_options=array();
	772	+ foreach ($options as $k => $v) {
773	773	$sort_options[]="\n\t\t".$k.': '.$v."";
774	774	}
775	775	$sort_options=implode(",", $sort_options);
776		- } else {
	776	+ }else {
777	777	$sort_options='';
778	778	}
779	779
		@@ -854,7 +854,7 @@ discard block
		block discarded – undo
854	854
855	855	// External references
856	856	$external_scripts=implode('', $this->jquery_code_for_load);
857		- extract(array (
	857	+ extract(array(
858	858	'library_src' => $external_scripts
859	859	));
860	860
		@@ -887,7 +887,7 @@ discard block
		block discarded – undo
887	887	* @return void
888	888	*/
889	889	public function _clear_compile() {
890		- $this->jquery_code_for_compile=array ();
	890	+ $this->jquery_code_for_compile=array();
891	891	}
892	892
893	893	// --------------------------------------------------------------------
		@@ -899,12 +899,12 @@ discard block
		block discarded – undo
899	899	*/
900	900	public function _document_ready($js) {
901	901	if (!is_array($js)) {
902		- $js=array (
	902	+ $js=array(
903	903	$js
904	904	);
905	905	}
906	906
907		- foreach ( $js as $script ) {
	907	+ foreach ($js as $script) {
908	908	$this->jquery_code_for_compile[]=$script;
909	909	}
910	910	}
		@@ -920,7 +920,7 @@ discard block
		block discarded – undo
920	920	* @return string
921	921	*/
922	922	public function _prep_element($element) {
923		- if (strrpos($element, 'this')===false&&strrpos($element, 'event')===false&&strrpos($element, 'self')===false) {
	923	+ if (strrpos($element, 'this')===false && strrpos($element, 'event')===false && strrpos($element, 'self')===false) {
924	924	$element='"'.addslashes($element).'"';
925	925	}
926	926	return $element;
		@@ -938,7 +938,7 @@ discard block
		block discarded – undo
938	938	if (is_array($value)) {
939	939	$value=implode(",", $value);
940	940	}
941		- if (strrpos($value, 'this')===false&&strrpos($value, 'event')===false&&strrpos($value, 'self')===false) {
	941	+ if (strrpos($value, 'this')===false && strrpos($value, 'event')===false && strrpos($value, 'self')===false) {
942	942	$value='"'.$value.'"';
943	943	}
944	944	return $value;
		@@ -953,8 +953,8 @@ discard block
		block discarded – undo
953	953	* @return string
954	954	*/
955	955	private function _validate_speed($speed) {
956		- if (in_array($speed, array (
957		- 'slow','normal','fast'
	956	+ if (in_array($speed, array(
	957	+ 'slow', 'normal', 'fast'
958	958	))) {
959	959	$speed='"'.$speed.'"';
960	960	} elseif (preg_match("/[^0-9]/", $speed)) {
		@@ -968,7 +968,7 @@ discard block
		block discarded – undo
968	968	$loading_notifier='<div class="ajax-loader">';
969	969	if ($this->ajaxLoader=='') {
970	970	$loading_notifier.="Loading...";
971		- } else {
	971	+ }else {
972	972	$loading_notifier.=$this->ajaxLoader;
973	973	}
974	974	$loading_notifier.='</div>';
		@@ -976,20 +976,20 @@ discard block
		block discarded – undo
976	976	$retour.="\t\t$({$responseElement}).prepend('{$loading_notifier}');\n";
977	977	}
978	978
979		- public function _get($url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true,$immediatly=false) {
980		- return $this->_ajax("get", $url,$params,$responseElement,$jsCallback,$attr,$hasLoader,$immediatly);
	979	+ public function _get($url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true, $immediatly=false) {
	980	+ return $this->_ajax("get", $url, $params, $responseElement, $jsCallback, $attr, $hasLoader, $immediatly);
981	981	}
982		- public function _post($url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true,$immediatly=false) {
983		- return $this->_ajax("post", $url,$params,$responseElement,$jsCallback,$attr,$hasLoader,$immediatly);
	982	+ public function _post($url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true, $immediatly=false) {
	983	+ return $this->_ajax("post", $url, $params, $responseElement, $jsCallback, $attr, $hasLoader, $immediatly);
984	984	}
985	985
986		- protected function _ajax($method,$url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true,$immediatly=false) {
987		- if(JString::isNull($params)){$params="{}";}
	986	+ protected function _ajax($method, $url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true, $immediatly=false) {
	987	+ if (JString::isNull($params)) {$params="{}"; }
988	988	$jsCallback=isset($jsCallback) ? $jsCallback : "";
989	989	$retour=$this->_getAjaxUrl($url, $attr);
990	990	$responseElement=$this->_getResponseElement($responseElement);
991	991	$retour.="var self=this;\n";
992		- if($hasLoader===true){
	992	+ if ($hasLoader===true) {
993	993	$this->addLoading($retour, $responseElement);
994	994	}
995	995	$retour.="$.".$method."(url,".$params.").done(function( data ) {\n";
		@@ -999,22 +999,22 @@ discard block
		block discarded – undo
999	999	return $retour;
1000	1000	}
1001	1001
1002		- protected function _getAjaxUrl($url,$attr){
	1002	+ protected function _getAjaxUrl($url, $attr) {
1003	1003	$url=$this->_correctAjaxUrl($url);
1004	1004	$retour="url='".$url."';\n";
1005	1005	$slash="/";
1006		- if(PhalconUtils::endsWith($url, "/"))
	1006	+ if (PhalconUtils::endsWith($url, "/"))
1007	1007	$slash="";
1008		- if(JString::isNotNull($attr)){
	1008	+ if (JString::isNotNull($attr)) {
1009	1009	if ($attr=="value")
1010	1010	$retour.="url=url+'".$slash."'+$(this).val();\n";
1011		- else if($attr!=null && $attr!=="")
	1011	+ else if ($attr!=null && $attr!=="")
1012	1012	$retour.="url=url+'".$slash."'+$(this).attr('".$attr."');\n";
1013	1013	}
1014	1014	return $retour;
1015	1015	}
1016	1016
1017		- protected function _getOnAjaxDone($responseElement,$jsCallback){
	1017	+ protected function _getOnAjaxDone($responseElement, $jsCallback) {
1018	1018	$retour="";
1019	1019	if ($responseElement!=="") {
1020	1020	$retour="\t$({$responseElement}).html( data );\n";
		@@ -1023,7 +1023,7 @@ discard block
		block discarded – undo
1023	1023	return $retour;
1024	1024	}
1025	1025
1026		- protected function _getResponseElement($responseElement){
	1026	+ protected function _getResponseElement($responseElement) {
1027	1027	if ($responseElement!=="") {
1028	1028	$responseElement=$this->_prep_value($responseElement);
1029	1029	}
		@@ -1033,7 +1033,7 @@ discard block
		block discarded – undo
1033	1033	protected function _correctAjaxUrl($url) {
1034	1034	if (PhalconUtils::endsWith($url, "/"))
1035	1035	$url=substr($url, 0, strlen($url)-1);
1036		- if (strncmp($url, 'http://', 7)!=0&&strncmp($url, 'https://', 8)!=0) {
	1036	+ if (strncmp($url, 'http://', 7)!=0 && strncmp($url, 'https://', 8)!=0) {
1037	1037	$url=$this->_di->get("url")->get($url);
1038	1038	}
1039	1039	return $url;
		@@ -1046,7 +1046,7 @@ discard block
		block discarded – undo
1046	1046	* @param string $method Method use
1047	1047	* @param string $jsCallback javascript code to execute after the request
1048	1048	*/
1049		- public function _json($url, $method="get", $params="{}", $jsCallback=NULL, $attr="id", $context="document",$immediatly=false) {
	1049	+ public function _json($url, $method="get", $params="{}", $jsCallback=NULL, $attr="id", $context="document", $immediatly=false) {
1050	1050	$jsCallback=isset($jsCallback) ? $jsCallback : "";
1051	1051	$retour=$this->_getAjaxUrl($url, $attr);
1052	1052	$retour.="$.{$method}(url,".$params.").done(function( data ) {\n";
		@@ -1066,7 +1066,7 @@ discard block
		block discarded – undo
1066	1066	* @param string $url the request address
1067	1067	* @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","params"=>"{}","method"=>"get")
1068	1068	*/
1069		- public function _jsonOn($event,$element, $url,$parameters=array()) {
	1069	+ public function _jsonOn($event, $element, $url, $parameters=array()) {
1070	1070	$preventDefault=true;
1071	1071	$stopPropagation=true;
1072	1072	$jsCallback=null;
		@@ -1075,7 +1075,7 @@ discard block
		block discarded – undo
1075	1075	$context="document";
1076	1076	$params="{}";
1077	1077	extract($parameters);
1078		- return $this->_add_event($element, $this->_json($url,$method, $params,$jsCallback, $attr,$context), $event, $preventDefault, $stopPropagation);
	1078	+ return $this->_add_event($element, $this->_json($url, $method, $params, $jsCallback, $attr, $context), $event, $preventDefault, $stopPropagation);
1079	1079	}
1080	1080
1081	1081	/**
		@@ -1086,19 +1086,19 @@ discard block
		block discarded – undo
1086	1086	* @param string $jsCallback javascript code to execute after the request
1087	1087	* @param string $context jquery DOM element, array container.
1088	1088	*/
1089		- public function _jsonArray($maskSelector, $url, $method="get", $params="{}", $jsCallback=NULL, $attr="id", $context=null,$immediatly=false) {
	1089	+ public function _jsonArray($maskSelector, $url, $method="get", $params="{}", $jsCallback=NULL, $attr="id", $context=null, $immediatly=false) {
1090	1090	$jsCallback=isset($jsCallback) ? $jsCallback : "";
1091	1091	$retour=$this->_getAjaxUrl($url, $attr);
1092		- if($context==null){
	1092	+ if ($context==null) {
1093	1093	$appendTo="\t\tnewElm.appendTo($('".$maskSelector."').parent());\n";
1094		- $newElm = "$('#'+newId)";
1095		- }else{
	1094	+ $newElm="$('#'+newId)";
	1095	+ }else {
1096	1096	$appendTo="\t\tnewElm.appendTo(".$context.");\n";
1097		- $newElm = $context.".find('#'+newId)";
	1097	+ $newElm=$context.".find('#'+newId)";
1098	1098	}
1099	1099	$retour.="var self = $(this);\n$.{$method}(url,".$params.").done(function( data ) {\n";
1100	1100	$retour.="\tdata=$.parseJSON(data);$.each(data, function(index, value) {\n"."\tvar created=false;var maskElm=$('".$maskSelector."').first();maskElm.hide();"."\tvar newId=(maskElm.attr('id') \|\| 'mask')+'-'+index;"."\tvar newElm=".$newElm.";\n"."\tif(!newElm.length){\n"."\t\tnewElm=maskElm.clone();newElm.attr('id',newId);\n";
1101		- $retour.= $appendTo;
	1101	+ $retour.=$appendTo;
1102	1102	$retour.="\t}\n"."\tfor(var key in value){\n"."\t\t\tvar html = $('<div />').append($(newElm).clone()).html();\n"."\t\t\tif(html.indexOf('[['+key+']]')>-1){\n"."\t\t\t\tcontent=$(html.split('[['+key+']]').join(value[key]));\n"."\t\t\t\t$(newElm).replaceWith(content);newElm=content;\n"."\t\t\t}\n"."\t\tvar sel='[data-id=\"'+key+'\"]';if($(sel,newElm).length){\n"."\t\t\tvar selElm=$(sel,newElm);\n"."\t\t\t if(selElm.is('[value]')) { selElm.attr('value',value[key]);selElm.val(value[key]);} else { selElm.html(value[key]); }\n"."\t\t}\n"."}\n"."\t$(newElm).show(true);"."\n"."\t$(newElm).removeClass('hide');"."});\n";
1103	1103
1104	1104	$retour.="\t".$jsCallback."\n"."});\n";
		@@ -1113,25 +1113,25 @@ discard block
		block discarded – undo
1113	1113	* @param string $url the request address
1114	1114	* @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","params"=>"{}","method"=>"get", "context"=>null)
1115	1115	*/
1116		- public function _jsonArrayOn($event,$element, $maskSelector,$url,$parameters=array()) {
	1116	+ public function _jsonArrayOn($event, $element, $maskSelector, $url, $parameters=array()) {
1117	1117	$preventDefault=true;
1118	1118	$stopPropagation=true;
1119	1119	$jsCallback=null;
1120	1120	$attr="id";
1121	1121	$method="get";
1122		- $context = null;
	1122	+ $context=null;
1123	1123	$params="{}";
1124	1124	extract($parameters);
1125		- return $this->_add_event($element, $this->_jsonArray($maskSelector,$url,$method, $params,$jsCallback, $attr, $context), $event, $preventDefault, $stopPropagation);
	1125	+ return $this->_add_event($element, $this->_jsonArray($maskSelector, $url, $method, $params, $jsCallback, $attr, $context), $event, $preventDefault, $stopPropagation);
1126	1126	}
1127	1127
1128		- public function _postForm($url, $form, $responseElement, $validation=false, $jsCallback=NULL, $attr="id", $hasLoader=true,$immediatly=false) {
	1128	+ public function _postForm($url, $form, $responseElement, $validation=false, $jsCallback=NULL, $attr="id", $hasLoader=true, $immediatly=false) {
1129	1129	$jsCallback=isset($jsCallback) ? $jsCallback : "";
1130	1130	$retour=$this->_getAjaxUrl($url, $attr);
1131	1131	$retour.="\nvar params=$('#".$form."').serialize();\n";
1132	1132	$responseElement=$this->_getResponseElement($responseElement);
1133	1133	$retour.="var self=this;\n";
1134		- if($hasLoader===true){
	1134	+ if ($hasLoader===true) {
1135	1135	$this->addLoading($retour, $responseElement);
1136	1136	}
1137	1137	$retour.="$.post(url,params).done(function( data ) {\n";
		@@ -1158,14 +1158,14 @@ discard block
		block discarded – undo
1158	1158	* @param string $responseElement
1159	1159	* @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true)
1160	1160	*/
1161		- public function _getOn($event,$element, $url, $params="{}", $responseElement="", $parameters=array()) {
	1161	+ public function _getOn($event, $element, $url, $params="{}", $responseElement="", $parameters=array()) {
1162	1162	$preventDefault=true;
1163	1163	$stopPropagation=true;
1164	1164	$jsCallback=null;
1165	1165	$attr="id";
1166	1166	$hasLoader=true;
1167	1167	extract($parameters);
1168		- return $this->_add_event($element, $this->_get($url, $params, $responseElement, $jsCallback, $attr,$hasLoader), $event, $preventDefault, $stopPropagation);
	1168	+ return $this->_add_event($element, $this->_get($url, $params, $responseElement, $jsCallback, $attr, $hasLoader), $event, $preventDefault, $stopPropagation);
1169	1169	}
1170	1170
1171	1171	/**
		@@ -1178,14 +1178,14 @@ discard block
		block discarded – undo
1178	1178	* @param string $responseElement
1179	1179	* @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true)
1180	1180	*/
1181		- public function _postOn($event,$element, $url, $params="{}", $responseElement="", $parameters=array()) {
	1181	+ public function _postOn($event, $element, $url, $params="{}", $responseElement="", $parameters=array()) {
1182	1182	$preventDefault=true;
1183	1183	$stopPropagation=true;
1184	1184	$jsCallback=null;
1185	1185	$attr="id";
1186	1186	$hasLoader=true;
1187	1187	extract($parameters);
1188		- return $this->_add_event($element, $this->_post($url, $params, $responseElement, $jsCallback, $attr,$hasLoader), $event, $preventDefault, $stopPropagation);
	1188	+ return $this->_add_event($element, $this->_post($url, $params, $responseElement, $jsCallback, $attr, $hasLoader), $event, $preventDefault, $stopPropagation);
1189	1189	}
1190	1190
1191	1191	/**
		@@ -1198,7 +1198,7 @@ discard block
		block discarded – undo
1198	1198	* @param string $responseElement
1199	1199	* @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"validation"=>false,"jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true)
1200	1200	*/
1201		- public function _postFormOn($event,$element, $url, $form, $responseElement="", $parameters=array()) {
	1201	+ public function _postFormOn($event, $element, $url, $form, $responseElement="", $parameters=array()) {
1202	1202	$preventDefault=true;
1203	1203	$stopPropagation=true;
1204	1204	$validation=false;
		@@ -1206,7 +1206,7 @@ discard block
		block discarded – undo
1206	1206	$attr="id";
1207	1207	$hasLoader=true;
1208	1208	extract($parameters);
1209		- return $this->_add_event($element, $this->_postForm($url, $form, $responseElement, $validation, $jsCallback, $attr,$hasLoader), $event, $preventDefault, $stopPropagation);
	1209	+ return $this->_add_event($element, $this->_postForm($url, $form, $responseElement, $validation, $jsCallback, $attr, $hasLoader), $event, $preventDefault, $stopPropagation);
1210	1210	}
1211	1211
1212	1212	/**

		@@ -420,8 +420,9 @@ discard block
		block discarded – undo
420	420	$element=$this->_prep_element($element);
421	421	$value=$this->_prep_value($value);
422	422	$str="$({$element}).after({$value});";
423		- if ($immediatly)
424		- $this->jquery_code_for_compile[]=$str;
	423	+ if ($immediatly) {
	424	+ $this->jquery_code_for_compile[]=$str;
	425	+ }
425	426	return $str;
426	427	}
427	428
		@@ -437,10 +438,12 @@ discard block
		block discarded – undo
437	438	if (isset($value)) {
438	439	$value=$this->_prep_value($value);
439	440	$str="$({$element}).attr(\"$attributeName\",{$value});";
440		- } else
441		- $str="$({$element}).attr(\"$attributeName\");";
442		- if ($immediatly)
443		- $this->jquery_code_for_compile[]=$str;
	441	+ } else {
	442	+ $str="$({$element}).attr(\"$attributeName\");";
	443	+ }
	444	+ if ($immediatly) {
	445	+ $this->jquery_code_for_compile[]=$str;
	446	+ }
444	447	return $str;
445	448	}
446	449
		@@ -456,10 +459,12 @@ discard block
		block discarded – undo
456	459	if (isset($param)) {
457	460	$param=$this->_prep_value($param);
458	461	$str="$({$element}).{$jQueryCall}({$param});";
459		- } else
460		- $str="$({$element}).{$jQueryCall}();";
461		- if ($immediatly)
462		- $this->jquery_code_for_compile[]=$str;
	462	+ } else {
	463	+ $str="$({$element}).{$jQueryCall}();";
	464	+ }
	465	+ if ($immediatly) {
	466	+ $this->jquery_code_for_compile[]=$str;
	467	+ }
463	468	return $str;
464	469	}
465	470	/**
		@@ -474,8 +479,9 @@ discard block
		block discarded – undo
474	479	$to=$this->_prep_element($to);
475	480	$element=$this->_prep_element($element);
476	481	$str="$({$to}).{$jQueryCall}({$element});";
477		- if ($immediatly)
478		- $this->jquery_code_for_compile[]=$str;
	482	+ if ($immediatly) {
	483	+ $this->jquery_code_for_compile[]=$str;
	484	+ }
479	485	return $str;
480	486	}
481	487	// --------------------------------------------------------------------
		@@ -512,8 +518,9 @@ discard block
		block discarded – undo
512	518
513	519	$str="$({$element}).animate({\n$animations\n\t\t}".$speed.$extra.");";
514	520
515		- if ($immediatly)
516		- $this->jquery_code_for_compile[]=$str;
	521	+ if ($immediatly) {
	522	+ $this->jquery_code_for_compile[]=$str;
	523	+ }
517	524	return $str;
518	525	}
519	526
		@@ -538,8 +545,9 @@ discard block
		block discarded – undo
538	545
539	546	$str="$({$element}).fadeIn({$speed}{$callback});";
540	547
541		- if ($immediatly)
542		- $this->jquery_code_for_compile[]=$str;
	548	+ if ($immediatly) {
	549	+ $this->jquery_code_for_compile[]=$str;
	550	+ }
543	551	return $str;
544	552	}
545	553
		@@ -564,8 +572,9 @@ discard block
		block discarded – undo
564	572
565	573	$str="$({$element}).fadeOut({$speed}{$callback});";
566	574
567		- if ($immediatly)
568		- $this->jquery_code_for_compile[]=$str;
	575	+ if ($immediatly) {
	576	+ $this->jquery_code_for_compile[]=$str;
	577	+ }
569	578	return $str;
570	579	}
571	580
		@@ -590,8 +599,9 @@ discard block
		block discarded – undo
590	599
591	600	$str="$({$element}).hide({$speed}{$callback});";
592	601
593		- if ($immediatly)
594		- $this->jquery_code_for_compile[]=$str;
	602	+ if ($immediatly) {
	603	+ $this->jquery_code_for_compile[]=$str;
	604	+ }
595	605	return $str;
596	606	}
597	607
		@@ -618,8 +628,9 @@ discard block
		block discarded – undo
618	628
619	629	$str="$({$element}).slideUp({$speed}{$callback});";
620	630
621		- if ($immediatly)
622		- $this->jquery_code_for_compile[]=$str;
	631	+ if ($immediatly) {
	632	+ $this->jquery_code_for_compile[]=$str;
	633	+ }
623	634	return $str;
624	635	}
625	636
		@@ -644,8 +655,9 @@ discard block
		block discarded – undo
644	655
645	656	$str="$({$element}).slideDown({$speed}{$callback});";
646	657
647		- if ($immediatly)
648		- $this->jquery_code_for_compile[]=$str;
	658	+ if ($immediatly) {
	659	+ $this->jquery_code_for_compile[]=$str;
	660	+ }
649	661	return $str;
650	662	}
651	663
		@@ -670,8 +682,9 @@ discard block
		block discarded – undo
670	682
671	683	$str="$({$element}).slideToggle({$speed}{$callback});";
672	684
673		- if ($immediatly)
674		- $this->jquery_code_for_compile[]=$str;
	685	+ if ($immediatly) {
	686	+ $this->jquery_code_for_compile[]=$str;
	687	+ }
675	688	return $str;
676	689	}
677	690
		@@ -688,8 +701,9 @@ discard block
		block discarded – undo
688	701	$element=$this->_prep_element($element);
689	702	$str="$({$element}).toggle();";
690	703
691		- if ($immediatly)
692		- $this->jquery_code_for_compile[]=$str;
	704	+ if ($immediatly) {
	705	+ $this->jquery_code_for_compile[]=$str;
	706	+ }
693	707	return $str;
694	708	}
695	709
		@@ -705,8 +719,9 @@ discard block
		block discarded – undo
705	719	$element=$this->_prep_element($element);
706	720	$str="$({$element}).trigger(\"$event\");";
707	721
708		- if ($immediatly)
709		- $this->jquery_code_for_compile[]=$str;
	722	+ if ($immediatly) {
	723	+ $this->jquery_code_for_compile[]=$str;
	724	+ }
710	725	return $str;
711	726	}
712	727
		@@ -731,8 +746,9 @@ discard block
		block discarded – undo
731	746
732	747	$str="$({$element}).show({$speed}{$callback});";
733	748
734		- if ($immediatly)
735		- $this->jquery_code_for_compile[]=$str;
	749	+ if ($immediatly) {
	750	+ $this->jquery_code_for_compile[]=$str;
	751	+ }
736	752	return $str;
737	753	}
738	754
		@@ -750,8 +766,9 @@ discard block
		block discarded – undo
750	766	$str.="else{".$jsCodeIfFalse."}";
751	767	}
752	768
753		- if ($immediatly)
754		- $this->jquery_code_for_compile[]=$str;
	769	+ if ($immediatly) {
	770	+ $this->jquery_code_for_compile[]=$str;
	771	+ }
755	772	return $str;
756	773	}
757	774
		@@ -817,10 +834,11 @@ discard block
		block discarded – undo
817	834	if ($stopPropagation===true) {
818	835	$js="event.stopPropagation();\n".$js;
819	836	}
820		- if (array_search($event, $this->jquery_events)===false)
821		- $event="\n\t$(".$this->_prep_element($element).").bind('{$event}',function(event){\n\t\t{$js}\n\t});\n";
822		- else
823		- $event="\n\t$(".$this->_prep_element($element).").{$event}(function(event){\n\t\t{$js}\n\t});\n";
	837	+ if (array_search($event, $this->jquery_events)===false) {
	838	+ $event="\n\t$(".$this->_prep_element($element).").bind('{$event}',function(event){\n\t\t{$js}\n\t});\n";
	839	+ } else {
	840	+ $event="\n\t$(".$this->_prep_element($element).").{$event}(function(event){\n\t\t{$js}\n\t});\n";
	841	+ }
824	842	$this->jquery_code_for_compile[]=$event;
825	843	return $event;
826	844	}
		@@ -870,8 +888,9 @@ discard block
		block discarded – undo
870	888
871	889	$output=($script_tags===FALSE) ? $script : $this->inline($script);
872	890
873		- if ($view!=NULL)
874		- $view->setVar($view_var, $output);
	891	+ if ($view!=NULL) {
	892	+ $view->setVar($view_var, $output);
	893	+ }
875	894	return $output;
876	895	}
877	896
		@@ -994,8 +1013,9 @@ discard block
		block discarded – undo
994	1013	}
995	1014	$retour.="$.".$method."(url,".$params.").done(function( data ) {\n";
996	1015	$retour.=$this->_getOnAjaxDone($responseElement, $jsCallback)."});\n";
997		- if ($immediatly)
998		- $this->jquery_code_for_compile[]=$retour;
	1016	+ if ($immediatly) {
	1017	+ $this->jquery_code_for_compile[]=$retour;
	1018	+ }
999	1019	return $retour;
1000	1020	}
1001	1021
		@@ -1003,13 +1023,15 @@ discard block
		block discarded – undo
1003	1023	$url=$this->_correctAjaxUrl($url);
1004	1024	$retour="url='".$url."';\n";
1005	1025	$slash="/";
1006		- if(PhalconUtils::endsWith($url, "/"))
1007		- $slash="";
	1026	+ if(PhalconUtils::endsWith($url, "/")) {
	1027	+ $slash="";
	1028	+ }
1008	1029	if(JString::isNotNull($attr)){
1009		- if ($attr=="value")
1010		- $retour.="url=url+'".$slash."'+$(this).val();\n";
1011		- else if($attr!=null && $attr!=="")
1012		- $retour.="url=url+'".$slash."'+$(this).attr('".$attr."');\n";
	1030	+ if ($attr=="value") {
	1031	+ $retour.="url=url+'".$slash."'+$(this).val();\n";
	1032	+ } else if($attr!=null && $attr!=="") {
	1033	+ $retour.="url=url+'".$slash."'+$(this).attr('".$attr."');\n";
	1034	+ }
1013	1035	}
1014	1036	return $retour;
1015	1037	}
		@@ -1031,8 +1053,9 @@ discard block
		block discarded – undo
1031	1053	}
1032	1054
1033	1055	protected function _correctAjaxUrl($url) {
1034		- if (PhalconUtils::endsWith($url, "/"))
1035		- $url=substr($url, 0, strlen($url)-1);
	1056	+ if (PhalconUtils::endsWith($url, "/")) {
	1057	+ $url=substr($url, 0, strlen($url)-1);
	1058	+ }
1036	1059	if (strncmp($url, 'http://', 7)!=0&&strncmp($url, 'https://', 8)!=0) {
1037	1060	$url=$this->_di->get("url")->get($url);
1038	1061	}
		@@ -1054,8 +1077,9 @@ discard block
		block discarded – undo
1054	1077	."if($('#'+key,".$context.").length){ if($('#'+key,".$context.").is('[value]')) { $('#'+key,".$context.").val(data[key]);} else { $('#'+key,".$context.").html(data[key]); }}};\n";
1055	1078	$retour.="\t".$jsCallback."\n
1056	1079	});\n";
1057		- if ($immediatly)
1058		- $this->jquery_code_for_compile[]=$retour;
	1080	+ if ($immediatly) {
	1081	+ $this->jquery_code_for_compile[]=$retour;
	1082	+ }
1059	1083	return $retour;
1060	1084	}
1061	1085
		@@ -1092,7 +1116,7 @@ discard block
		block discarded – undo
1092	1116	if($context==null){
1093	1117	$appendTo="\t\tnewElm.appendTo($('".$maskSelector."').parent());\n";
1094	1118	$newElm = "$('#'+newId)";
1095		- }else{
	1119	+ } else{
1096	1120	$appendTo="\t\tnewElm.appendTo(".$context.");\n";
1097	1121	$newElm = $context.".find('#'+newId)";
1098	1122	}
		@@ -1102,8 +1126,9 @@ discard block
		block discarded – undo
1102	1126	$retour.="\t}\n"."\tfor(var key in value){\n"."\t\t\tvar html = $('<div />').append($(newElm).clone()).html();\n"."\t\t\tif(html.indexOf('[['+key+']]')>-1){\n"."\t\t\t\tcontent=$(html.split('[['+key+']]').join(value[key]));\n"."\t\t\t\t$(newElm).replaceWith(content);newElm=content;\n"."\t\t\t}\n"."\t\tvar sel='[data-id=\"'+key+'\"]';if($(sel,newElm).length){\n"."\t\t\tvar selElm=$(sel,newElm);\n"."\t\t\t if(selElm.is('[value]')) { selElm.attr('value',value[key]);selElm.val(value[key]);} else { selElm.html(value[key]); }\n"."\t\t}\n"."}\n"."\t$(newElm).show(true);"."\n"."\t$(newElm).removeClass('hide');"."});\n";
1103	1127
1104	1128	$retour.="\t".$jsCallback."\n"."});\n";
1105		- if ($immediatly)
1106		- $this->jquery_code_for_compile[]=$retour;
	1129	+ if ($immediatly) {
	1130	+ $this->jquery_code_for_compile[]=$retour;
	1131	+ }
1107	1132	return $retour;
1108	1133	}
1109	1134	/**
		@@ -1143,8 +1168,9 @@ discard block
		block discarded – undo
1143	1168	}});\n";
1144	1169	$retour.="$('#".$form."').submit();\n";
1145	1170	}
1146		- if ($immediatly)
1147		- $this->jquery_code_for_compile[]=$retour;
	1171	+ if ($immediatly) {
	1172	+ $this->jquery_code_for_compile[]=$retour;
	1173	+ }
1148	1174	return $retour;
1149	1175	}
1150	1176
		@@ -1220,11 +1246,13 @@ discard block
		block discarded – undo
1220	1246	public function _doJQuery($element, $jqueryCall, $param="", $jsCallback="", $immediatly=false) {
1221	1247	$param=$this->_prep_value($param);
1222	1248	$callback="";
1223		- if ($jsCallback!="")
1224		- $callback=", function(event){\n{$jsCallback}\n}";
	1249	+ if ($jsCallback!="") {
	1250	+ $callback=", function(event){\n{$jsCallback}\n}";
	1251	+ }
1225	1252	$script="$(".$this->_prep_element($element).").".$jqueryCall."(".$param.$callback.");\n";
1226		- if ($immediatly)
1227		- $this->jquery_code_for_compile[]=$script;
	1253	+ if ($immediatly) {
	1254	+ $this->jquery_code_for_compile[]=$script;
	1255	+ }
1228	1256	return $script;
1229	1257	}
1230	1258
		@@ -1252,8 +1280,9 @@ discard block
		block discarded – undo
1252	1280	*/
1253	1281	public function _exec($js, $immediatly=false) {
1254	1282	$script=$js."\n";
1255		- if ($immediatly)
1256		- $this->jquery_code_for_compile[]=$script;
	1283	+ if ($immediatly) {
	1284	+ $this->jquery_code_for_compile[]=$script;
	1285	+ }
1257	1286	return $script;
1258	1287	}
1259	1288

jcheron / phalcon-jquery

Push — master ( c831e1...10d75a )

Status

Category

Spacing +59 added lines, -59 removed lines patch added patch discarded remove patch

Braces +92 added lines, -63 removed lines patch added patch discarded remove patch