Commit 6ec1493a authored by webchick's avatar webchick

Issue #2194763 by nod_, Sam152 | dcrocks: 'back to site' button doesn't work...

Issue #2194763 by nod_, Sam152 | dcrocks: 'back to site' button  doesn't work on site configured for 'dirty' url's.
parent 06aa520e
......@@ -16,7 +16,7 @@
// there is not need to save the current path because the page is loaded within
// an existing "workflow".
if (!pathInfo.currentPathIsAdmin && !/destination=/.test(windowLocation.search)) {
sessionStorage.setItem('escapeAdminPath', windowLocation.pathname.substring(pathInfo.basePath.length) + windowLocation.search);
sessionStorage.setItem('escapeAdminPath', windowLocation);
}
/**
......@@ -30,7 +30,7 @@
var $toolbarEscape = $('[data-toolbar-escape-admin]').once('escapeAdmin');
if ($toolbarEscape.length) {
if (pathInfo.currentPathIsAdmin && escapeAdminPath !== null) {
$toolbarEscape.attr('href', Drupal.url(escapeAdminPath));
$toolbarEscape.attr('href', escapeAdminPath);
$toolbarEscape.closest('.toolbar-tab').removeClass('hidden');
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment