From 26c8c5f03ffe5222f165f10a6538ff41c92a6bdc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Thu, 30 Nov 2017 12:38:33 +0100 Subject: [PATCH] Don't fire onAfterTab twice & check tab's there Related to #203 --- src/octoprint/static/js/app/main.js | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/octoprint/static/js/app/main.js b/src/octoprint/static/js/app/main.js index a9be25c3..ee2ba851 100644 --- a/src/octoprint/static/js/app/main.js +++ b/src/octoprint/static/js/app/main.js @@ -526,6 +526,15 @@ $(function() { onTabChange(OCTOPRINT_INITIAL_TAB); onAfterTabChange(OCTOPRINT_INITIAL_TAB, undefined); + var changeTab = function() { + var hashtag = window.location.hash; + + var tab = $('#tabs').find('a[href="' + hashtag + '"]'); + if (tab) { + tab.tab("show"); + } + }; + // Fix input element click problems on dropdowns $(".dropdown input, .dropdown label").click(function(e) { e.stopPropagation(); @@ -539,15 +548,6 @@ $(function() { // reload overlay $("#reloadui_overlay_reload").click(function() { location.reload(); }); - var changeTab = function() - { - var hashtag = window.location.hash; - - var tab = $('#tabs a[href="' + hashtag + '"]'); - tab.tab("show"); - onTabChange(hashtag); - }; - //~~ final initialization - passive login, settings fetch, view model binding if (!_.has(viewModelMap, "settingsViewModel")) {