From 90b89a488e4e888a1e59e274087b0ba72b5ef785 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Sat, 13 Feb 2016 15:09:09 +0200 Subject: [PATCH] closes #4175 --- public/src/admin/admin.js | 5 +++++ public/src/app.js | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/public/src/admin/admin.js b/public/src/admin/admin.js index 8d2535eaff..22258d4f66 100644 --- a/public/src/admin/admin.js +++ b/public/src/admin/admin.js @@ -5,6 +5,11 @@ $(document).ready(function() { setupKeybindings(); + // on page reload show correct tab if url has # + if (window.location.hash) { + $('.nav-pills a[href=' + window.location.hash + ']').tab('show'); + } + if(!/Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent)) { require(['admin/modules/search'], function(search) { search.init(); diff --git a/public/src/app.js b/public/src/app.js index 9fbe1c9f14..36f5c67b5e 100644 --- a/public/src/app.js +++ b/public/src/app.js @@ -25,7 +25,7 @@ app.cacheBuster = null; app.load = function() { $('document').ready(function () { - var url = ajaxify.start(window.location.pathname.slice(1) + window.location.search, true); + var url = ajaxify.start(window.location.pathname.slice(1) + window.location.search + window.location.hash, true); ajaxify.end(url, app.template); handleStatusChange();