Update prep_jquery_selector, add href auto active

Author: jcheron

Ajax/common/traits/JsUtilsAjaxTrait.php

@@ -114,7 +114,9 @@ protected function _getOnAjaxDone($responseElement,$jqueryDone,$ajaxTransition,$
 				$retour="\t{$responseElement}.{$jqueryDone}( data );\n";
 		}
 		if(isset($history)){
-			$retour.="\nwindow.history.pushState({'html':data,'selector':".Javascript::prep_value($history).",'jqueryDone':'{$jqueryDone}'},'', url);";
+			$retour.="\nfunction getHref(url) { return \$('a').filter(function(){return \$(this).prop('href') == url; });}";
+			$retour.="\nif(window._previousURL) getHref(window._previousURL).removeClass('active');getHref(url).addClass('active');";
+			$retour.="\nwindow.history.pushState({'html':data,'selector':".Javascript::prep_value($history).",'jqueryDone':'{$jqueryDone}'},'', url);window._previousURL=url;";
 		}
 		if($hasLoader==="internal"){
 			$retour.="\n$(self).removeClass('loading');";
@@ -125,7 +127,6 @@ protected function _getOnAjaxDone($responseElement,$jqueryDone,$ajaxTransition,$
 
 	protected function _getResponseElement($responseElement){
 		if (JString::isNotNull($responseElement)) {
-			$responseElement=Javascript::prep_value($responseElement);
 			$responseElement=Javascript::prep_jquery_selector($responseElement);
 		}
 		return $responseElement;
@@ -424,7 +425,7 @@ public function getOnClick($element, $url, $responseElement="", $parameters=arra
 	public function getHref($element,$responseElement="",$parameters=array()){
 		$parameters["attr"]="href";
 		if(JString::isNull($responseElement)){
-			$responseElement='$($(this).attr("data-target"))';
+			$responseElement='%$(self).attr("data-target")%';
 		}
 		if(!isset($parameters["historize"])){
 			$parameters["historize"]=true;
@@ -442,7 +443,7 @@ public function getHref($element,$responseElement="",$parameters=array()){
 	public function postHref($element,$responseElement="",$parameters=array()){
 		$parameters["attr"]="href";
 		if(JString::isNull($responseElement)){
-			$responseElement='$($(this).attr("data-target"))';
+			$responseElement='%$(this).attr("data-target")%';
 		}
 		if(!isset($parameters["historize"])){
 			$parameters["historize"]=true;

Ajax/service/Javascript.php

@@ -49,12 +49,12 @@ public static function prep_value($value) {
 			$value=\str_replace(["\\","\""], ["\\\\","\\\""], $value);
 			$value='"'.$value.'"';
 		}
-		return $value;
+		return trim($value,"%");
 	}
 
 	public static function prep_jquery_selector($value){
 		if(JString::startswith($value, '$(')===false){
-			return '$('.$value.')';
+			return '$('.self::prep_value($value).')';
 		}
 		return $value;
 	}