pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't fire onAfterTab twice & check tab's there

Browse source 
Related to #203
This commit is contained in:
Gina Häußge 2017-11-30 12:38:33 +01:00
parent f2bd5d605e
commit 26c8c5f03f
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/octoprint/static/js/app/main.js
View file

@ -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")) {