sundowndev
/
betaflight-configurator
mirror of https://github.com/sundowndev/betaflight-configurator.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2302 from spracing/rework-last-tab 

Allows the user to always open the last tab that was used *before* the CLI tab.
10.8-maintenance
Michael Keller 2021-01-16 19:15:33 +08:00 committed by GitHub
parent 5444ce37c3 c0f66a5aca
commit de071bc136
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/js/gui.js
View File

@ -388,13 +388,11 @@ GuiControl.prototype.content_ready = function (callback) {
GuiControl.prototype.selectDefaultTabWhenConnected = function() { GuiControl.prototype.selectDefaultTabWhenConnected = function() {
ConfigStorage.get(['rememberLastTab', 'lastTab'], function (result) { ConfigStorage.get(['rememberLastTab', 'lastTab'], function (result) {
if (!(result.rememberLastTab if (result.rememberLastTab && result.lastTab) {
&& !!result.lastTab $(`#tabs ul.mode-connected .${result.lastTab} a`).click();
&& result.lastTab.substring(4) !== "cli")) { } else {
$('#tabs ul.mode-connected .tab_setup a').click(); $('#tabs ul.mode-connected .tab_setup a').click();
return;
} }
$(`#tabs ul.mode-connected .${result.lastTab} a`).click();
}); });
}; };

12
src/js/main.js
View File

@ -219,9 +219,15 @@ function startProcess() {
// Tabs // Tabs
$("#tabs ul.mode-connected li").click(function() { $("#tabs ul.mode-connected li").click(function() {
// store the first class of the current tab (omit things like ".active") // store the first class of the current tab (omit things like ".active")
ConfigStorage.set( const tabName = $(this).attr("class").split(' ')[0];
{lastTab: $(this).attr("class").split(' ')[0]}
); const tabNameWithoutPrefix = tabName.substring(4);
if (tabNameWithoutPrefix !== "cli") {
// Don't store 'cli' otherwise you can never connect to another tab.
ConfigStorage.set(
{lastTab: tabName},
);
}
}); });
if (GUI.isCordova()) { if (GUI.isCordova()) {