moving default tab to new tabs object
parent
7e67cccf96
commit
5efb1685a4
|
@ -51,7 +51,7 @@ $(document).ready(function() {
|
||||||
$('#content').empty();
|
$('#content').empty();
|
||||||
|
|
||||||
// load default html
|
// load default html
|
||||||
tab_initialize_default();
|
tabs.default.initialize();
|
||||||
}
|
}
|
||||||
|
|
||||||
$(this).data("clicks", !clicks);
|
$(this).data("clicks", !clicks);
|
||||||
|
|
12
main.js
12
main.js
|
@ -47,8 +47,8 @@ $(document).ready(function() {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Tabs
|
// Tabs
|
||||||
var tabs = $('#tabs > ul');
|
var ui_tabs = $('#tabs > ul');
|
||||||
$('a', tabs).click(function() {
|
$('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
|
if ($(this).parent().hasClass('active') == false && !GUI.tab_switch_in_progress) { // only initialize when the tab isn't already active
|
||||||
var self = this;
|
var self = this;
|
||||||
var index = $(self).parent().index();
|
var index = $(self).parent().index();
|
||||||
|
@ -64,7 +64,7 @@ $(document).ready(function() {
|
||||||
|
|
||||||
GUI.tab_switch_cleanup(function() {
|
GUI.tab_switch_cleanup(function() {
|
||||||
// disable previously active tab highlight
|
// disable previously active tab highlight
|
||||||
$('li', tabs).removeClass('active');
|
$('li', ui_tabs).removeClass('active');
|
||||||
|
|
||||||
// Highlight selected tab
|
// Highlight selected tab
|
||||||
$(self).parent().addClass('active');
|
$(self).parent().addClass('active');
|
||||||
|
@ -74,10 +74,10 @@ $(document).ready(function() {
|
||||||
|
|
||||||
switch (tab) {
|
switch (tab) {
|
||||||
case 'tab_initial_setup':
|
case 'tab_initial_setup':
|
||||||
tab_initialize_initial_setup();
|
tabs.initial_setup.initialize();
|
||||||
break;
|
break;
|
||||||
case 'tab_pid_tuning':
|
case 'tab_pid_tuning':
|
||||||
tab_initialize_pid_tuning();
|
tabs.pid_tuning.initialize();
|
||||||
break;
|
break;
|
||||||
case 'tab_receiver':
|
case 'tab_receiver':
|
||||||
tab_initialize_receiver();
|
tab_initialize_receiver();
|
||||||
|
@ -110,7 +110,7 @@ $(document).ready(function() {
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
tab_initialize_default();
|
tabs.default.initialize();
|
||||||
|
|
||||||
// options
|
// options
|
||||||
$('a#options').click(function() {
|
$('a#options').click(function() {
|
||||||
|
|
|
@ -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';
|
GUI.active_tab = 'default';
|
||||||
|
|
||||||
$('#content').load("./tabs/default.html", function() {
|
$('#content').load("./tabs/default.html", function() {
|
||||||
|
@ -16,5 +20,11 @@ function tab_initialize_default(callback) {
|
||||||
$('div.welcome a').click(function() {
|
$('div.welcome a').click(function() {
|
||||||
ga_tracker.sendEvent('ExternalUrls', 'Click', $(this).prop('href'));
|
ga_tracker.sendEvent('ExternalUrls', 'Click', $(this).prop('href'));
|
||||||
});
|
});
|
||||||
|
|
||||||
|
if (callback) callback();
|
||||||
});
|
});
|
||||||
}
|
};
|
||||||
|
|
||||||
|
tabs.default.cleanup = function(callback) {
|
||||||
|
if (callback) callback();
|
||||||
|
};
|
|
@ -222,7 +222,7 @@ function tab_initialize_firmware_flasher(callback) {
|
||||||
$('a.back').click(function() {
|
$('a.back').click(function() {
|
||||||
if (!GUI.connect_lock) { // button disabled while flashing is in progress
|
if (!GUI.connect_lock) { // button disabled while flashing is in progress
|
||||||
GUI.tab_switch_cleanup(function() {
|
GUI.tab_switch_cleanup(function() {
|
||||||
tab_initialize_default();
|
tabs.default.initialize();
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
GUI.log(chrome.i18n.getMessage('firmwareFlasherWaitForFinish'));
|
GUI.log(chrome.i18n.getMessage('firmwareFlasherWaitForFinish'));
|
||||||
|
|
|
@ -119,7 +119,7 @@ function tab_initialize_logging(callback) {
|
||||||
GUI.tab_switch_cleanup(function() {
|
GUI.tab_switch_cleanup(function() {
|
||||||
MSP_pass_through = false;
|
MSP_pass_through = false;
|
||||||
$('#tabs > ul li').removeClass('active');
|
$('#tabs > ul li').removeClass('active');
|
||||||
tab_initialize_default();
|
tabs.default.initialize();
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
Loading…
Reference in New Issue