From 5efb1685a46df9190a7264b9e8774accf606c32b Mon Sep 17 00:00:00 2001 From: cTn Date: Thu, 10 Jul 2014 18:14:17 +0200 Subject: [PATCH] moving default tab to new tabs object --- js/serial_backend.js | 2 +- main.js | 12 ++++++------ tabs/default.js | 14 ++++++++++++-- tabs/firmware_flasher.js | 2 +- tabs/logging.js | 2 +- 5 files changed, 21 insertions(+), 11 deletions(-) diff --git a/js/serial_backend.js b/js/serial_backend.js index c5dfe7d39e..aae51687b6 100644 --- a/js/serial_backend.js +++ b/js/serial_backend.js @@ -51,7 +51,7 @@ $(document).ready(function() { $('#content').empty(); // load default html - tab_initialize_default(); + tabs.default.initialize(); } $(this).data("clicks", !clicks); diff --git a/main.js b/main.js index 15bc582123..2ecb1d51b5 100644 --- a/main.js +++ b/main.js @@ -47,8 +47,8 @@ $(document).ready(function() { } // Tabs - var tabs = $('#tabs > ul'); - $('a', tabs).click(function() { + var ui_tabs = $('#tabs > ul'); + $('a', ui_tabs).click(function() { if ($(this).parent().hasClass('active') == false && !GUI.tab_switch_in_progress) { // only initialize when the tab isn't already active var self = this; var index = $(self).parent().index(); @@ -64,7 +64,7 @@ $(document).ready(function() { GUI.tab_switch_cleanup(function() { // disable previously active tab highlight - $('li', tabs).removeClass('active'); + $('li', ui_tabs).removeClass('active'); // Highlight selected tab $(self).parent().addClass('active'); @@ -74,10 +74,10 @@ $(document).ready(function() { switch (tab) { case 'tab_initial_setup': - tab_initialize_initial_setup(); + tabs.initial_setup.initialize(); break; case 'tab_pid_tuning': - tab_initialize_pid_tuning(); + tabs.pid_tuning.initialize(); break; case 'tab_receiver': tab_initialize_receiver(); @@ -110,7 +110,7 @@ $(document).ready(function() { } }); - tab_initialize_default(); + tabs.default.initialize(); // options $('a#options').click(function() { diff --git a/tabs/default.js b/tabs/default.js index 0cba499195..61dc045b73 100644 --- a/tabs/default.js +++ b/tabs/default.js @@ -1,4 +1,8 @@ -function tab_initialize_default(callback) { +tabs.default = function() { +}; + +tabs.default.initialize = function(callback) { + GUI.active_tab_ref = this; GUI.active_tab = 'default'; $('#content').load("./tabs/default.html", function() { @@ -16,5 +20,11 @@ function tab_initialize_default(callback) { $('div.welcome a').click(function() { ga_tracker.sendEvent('ExternalUrls', 'Click', $(this).prop('href')); }); + + if (callback) callback(); }); -} \ No newline at end of file +}; + +tabs.default.cleanup = function(callback) { + if (callback) callback(); +}; \ No newline at end of file diff --git a/tabs/firmware_flasher.js b/tabs/firmware_flasher.js index ccebdda325..01411bd5bb 100644 --- a/tabs/firmware_flasher.js +++ b/tabs/firmware_flasher.js @@ -222,7 +222,7 @@ function tab_initialize_firmware_flasher(callback) { $('a.back').click(function() { if (!GUI.connect_lock) { // button disabled while flashing is in progress GUI.tab_switch_cleanup(function() { - tab_initialize_default(); + tabs.default.initialize(); }); } else { GUI.log(chrome.i18n.getMessage('firmwareFlasherWaitForFinish')); diff --git a/tabs/logging.js b/tabs/logging.js index 192d3830e7..41a6cc4c38 100644 --- a/tabs/logging.js +++ b/tabs/logging.js @@ -119,7 +119,7 @@ function tab_initialize_logging(callback) { GUI.tab_switch_cleanup(function() { MSP_pass_through = false; $('#tabs > ul li').removeClass('active'); - tab_initialize_default(); + tabs.default.initialize(); }); } });