Update JsUtilsActionsTrait.php

jcheron · jcheron · commit bb25ea4d61ce · 2019-06-09T19:39:00.000+02:00
diff --git a/Ajax/common/traits/JsUtilsActionsTrait.php b/Ajax/common/traits/JsUtilsActionsTrait.php
@@ -792,13 +792,13 @@ public function counterOn($element, $event, $counterSelector, $value = 0, $limit
 	 * @return string
 	 */
 	public function activateLink($target, $property = 'href', $href = null) {
-		$js = '$(' . $target . ' [' . $property . ']).removeClass("active");';
+		$js = '$("' . $target . ' [' . $property . ']").removeClass("active");';
 		if (isset($href)) {
 			$js .= 'var href="' . $href . '";';
 		} else {
 			$js .= 'var href=window.location.href;';
 		}
-		$js .= '$(' . $target . ' [' . $property . ']).each(function(){if(href.includes($(this).attr("' . $property . '"))) $(this).addClass("active");});';
-		return $js;
+		$js .= '$("' . $target . ' [' . $property . ']").each(function(){if(href.includes($(this).attr("' . $property . '"))) $(this).addClass("active");});';
+		return $this->execAtLast($js);
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -792,13 +792,13 @@ public function counterOn($element, $event, $counterSelector, $value = 0, $limit`
`792`	`792`	`* @return string`
`793`	`793`	`*/`
`794`	`794`	`public function activateLink($target, $property = 'href', $href = null) {`
`795`		`- $js = '$(' . $target . ' [' . $property . ']).removeClass("active");';`
	`795`	`+ $js = '$("' . $target . ' [' . $property . ']").removeClass("active");';`
`796`	`796`	`if (isset($href)) {`
`797`	`797`	`$js .= 'var href="' . $href . '";';`
`798`	`798`	`} else {`
`799`	`799`	`$js .= 'var href=window.location.href;';`
`800`	`800`	`}`
`801`		`- $js .= '$(' . $target . ' [' . $property . ']).each(function(){if(href.includes($(this).attr("' . $property . '"))) $(this).addClass("active");});';`
`802`		`- return $js;`
	`801`	`+ $js .= '$("' . $target . ' [' . $property . ']").each(function(){if(href.includes($(this).attr("' . $property . '"))) $(this).addClass("active");});';`
	`802`	`+ return $this->execAtLast($js);`
`803`	`803`	`}`
`804`	`804`	`}`