Skip to content
Snippets Groups Projects
Unverified Commit 814b36a0 authored by TinaH's avatar TinaH Committed by GitHub
Browse files

Turbolinks compatibility (#1320)

parent e7c3f56e
No related branches found
No related tags found
No related merge requests found
......@@ -63,11 +63,11 @@ class JavascriptRenderer extends BaseJavascriptRenderer
$cssRoute = preg_replace('/\Ahttps?:/', '', $cssRoute);
$jsRoute = preg_replace('/\Ahttps?:/', '', $jsRoute);
$html = "<link rel='stylesheet' type='text/css' property='stylesheet' href='{$cssRoute}'>";
$html .= "<script src='{$jsRoute}'></script>";
$html = "<link rel='stylesheet' type='text/css' property='stylesheet' href='{$cssRoute}' data-turbolinks-eval='false' data-turbo-eval='false'>";
$html .= "<script src='{$jsRoute}' data-turbolinks-eval='false' data-turbo-eval='false'></script>";
if ($this->isJqueryNoConflictEnabled()) {
$html .= '<script>jQuery.noConflict(true);</script>' . "\n";
$html .= '<script data-turbo-eval="false">jQuery.noConflict(true);</script>' . "\n";
}
$html .= $this->getInlineHtml();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment