ajax getResponseElement refactoring

Author: jcheron

Ajax/common/traits/JsUtilsAjaxTrait.php

@@ -34,7 +34,7 @@ protected function _ajax($method,$url,$responseElement="",$parameters=[]) {
 		$retour=$this->_getAjaxUrl($url, $attr);
 		$responseElement=$this->_getResponseElement($responseElement);
 		$retour.="var self=this;\n";
-		if($hasLoader===true){
+		if($hasLoader===true && JString::isNotNull($responseElement)){
 			$this->addLoading($retour, $responseElement);
 		}
 
@@ -107,7 +107,7 @@ protected function _getOnAjaxDone($responseElement,$jqueryDone,$ajaxTransition,$
 			if(\is_callable($call))
 				$retour="\t".$call($responseElement,$jqueryDone).";\n";
 			else
-				$retour="\t$({$responseElement}).{$jqueryDone}( data );\n";
+				$retour="\t{$responseElement}.{$jqueryDone}( data );\n";
 		}
 		$retour.="\t".$jsCallback."\n";
 		return $retour;
@@ -116,6 +116,7 @@ protected function _getOnAjaxDone($responseElement,$jqueryDone,$ajaxTransition,$
 	protected function _getResponseElement($responseElement){
 		if ($responseElement!=="") {
 			$responseElement=Javascript::prep_value($responseElement);
+			$responseElement=Javascript::prep_jquery_selector($responseElement);
 		}
 		return $responseElement;
 	}
@@ -156,8 +157,8 @@ protected function addLoading(&$retour, $responseElement) {
 			$loading_notifier.=$this->ajaxLoader;
 		}
 		$loading_notifier.='</div>';
-		$retour.="$({$responseElement}).empty();\n";
-		$retour.="\t\t$({$responseElement}).prepend('{$loading_notifier}');\n";
+		$retour.="{$responseElement}.empty();\n";
+		$retour.="\t\t{$responseElement}.prepend('{$loading_notifier}');\n";
 	}
 
 	protected function setAjaxDataCall($params){

Ajax/service/AjaxTransition.php

@@ -4,15 +4,15 @@
 
 class AjaxTransition {
 	public static function none($responseElement,$jqueryDone="html"){
-		return "$({$responseElement}).{$jqueryDone}( data )";
+		return $responseElement.".".$jqueryDone."( data )";
 	}
 
 	public static function jqFade($responseElement,$jqueryDone="html"){
-		return "$({$responseElement}).hide().{$jqueryDone}( data ).fadeIn()";
+		return $responseElement.".hide().{$jqueryDone}( data ).fadeIn()";
 	}
 
 	public static function jqSlide($responseElement,$jqueryDone="html"){
-		return "$({$responseElement}).hide().{$jqueryDone}( data ).slideDown()";
+		return $responseElement.".hide().{$jqueryDone}( data ).slideDown()";
 	}
 
 	public static function random($responseElement,$jqueryDone="html"){
@@ -26,7 +26,7 @@ public static function __callStatic($name, $arguments){
 			$responseElement=$arguments[0];
 			$jqueryDone=$arguments[1];
 			$name=JString::camelCaseToSeparated($name);
-			return "$({$responseElement}).{$jqueryDone}( data ).transition('{$name} in')";
+			return $responseElement.".".$jqueryDone."( data ).transition('{$name} in')";
 		}
 	}
 }

Ajax/service/Javascript.php

@@ -42,4 +42,11 @@ public static function prep_value($value) {
 		}
 		return $value;
 	}
+
+	public static function prep_jquery_selector($value){
+		if(JString::startswith($value, '$(')===false){
+			return '$('.$value.')';
+		}
+		return $value;
+	}
 }