Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

WebUI: Restore previously used tab on load #20705

Merged
merged 4 commits into from
May 27, 2024
Merged

WebUI: Restore previously used tab on load #20705

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
432d02d
WebUI: Move search panel JS to separate file
Piccirello Mar 25, 2024
4119d15
WebUI: Handle log panel JS not being loaded
Piccirello Mar 25, 2024
370f7be
WebUI: Restore previously used tab on load
Piccirello Mar 25, 2024
89b4c38
WebUI: Reactivate double click event after search completes
Piccirello Mar 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
120 changes: 106 additions & 14 deletions src/webui/www/private/scripts/client.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,13 @@ window.qBittorrent.Client = (() => {
getSyncMainDataInterval: getSyncMainDataInterval,
isStopped: isStopped,
stop: stop,
mainTitle: mainTitle
mainTitle: mainTitle,
showSearchEngine: showSearchEngine,
showRssReader: showRssReader,
showLogViewer: showLogViewer,
isShowSearchEngine: isShowSearchEngine,
isShowRssReader: isShowRssReader,
isShowLogViewer: isShowLogViewer
};
};

Expand Down Expand Up @@ -77,6 +83,29 @@ window.qBittorrent.Client = (() => {
return title;
};

let showingSearchEngine = false;
let showingRssReader = false;
let showingLogViewer = false;

const showSearchEngine = function(bool) {
showingSearchEngine = bool;
};
const showRssReader = function(bool) {
showingRssReader = bool;
};
const showLogViewer = function(bool) {
showingLogViewer = bool;
};
const isShowSearchEngine = function() {
return showingSearchEngine;
};
const isShowRssReader = function() {
return showingRssReader;
};
const isShowLogViewer = function() {
return showingLogViewer;
};

return exports();
})();
Object.freeze(window.qBittorrent.Client);
Expand Down Expand Up @@ -128,6 +157,9 @@ let setFilter = function() {};
let toggleFilterDisplay = function() {};

window.addEventListener("DOMContentLoaded", function() {
let isSearchPanelLoaded = false;
let isLogPanelLoaded = false;

const saveColumnSizes = function() {
const filters_width = $('Filters').getSize().x;
LocalPreferences.set('filters_width', filters_width);
Expand Down Expand Up @@ -307,9 +339,9 @@ window.addEventListener("DOMContentLoaded", function() {
$('speedInBrowserTitleBarLink').firstChild.style.opacity = '0';

// After showing/hiding the toolbar + status bar
let showSearchEngine = LocalPreferences.get('show_search_engine') !== "false";
let showRssReader = LocalPreferences.get('show_rss_reader') !== "false";
let showLogViewer = LocalPreferences.get('show_log_viewer') === 'true';
window.qBittorrent.Client.showSearchEngine(LocalPreferences.get('show_search_engine') !== "false");
window.qBittorrent.Client.showRssReader(LocalPreferences.get('show_rss_reader') !== "false");
window.qBittorrent.Client.showLogViewer(LocalPreferences.get('show_log_viewer') === 'true');

// After Show Top Toolbar
MochaUI.Desktop.setDesktopSize();
Expand Down Expand Up @@ -1070,25 +1102,25 @@ window.addEventListener("DOMContentLoaded", function() {
});

$('showSearchEngineLink').addEvent('click', function(e) {
showSearchEngine = !showSearchEngine;
LocalPreferences.set('show_search_engine', showSearchEngine.toString());
window.qBittorrent.Client.showSearchEngine(!window.qBittorrent.Client.isShowSearchEngine());
LocalPreferences.set('show_search_engine', window.qBittorrent.Client.isShowSearchEngine().toString());
updateTabDisplay();
});

$('showRssReaderLink').addEvent('click', function(e) {
showRssReader = !showRssReader;
LocalPreferences.set('show_rss_reader', showRssReader.toString());
window.qBittorrent.Client.showRssReader(!window.qBittorrent.Client.isShowRssReader());
LocalPreferences.set('show_rss_reader', window.qBittorrent.Client.isShowRssReader().toString());
updateTabDisplay();
});

$('showLogViewerLink').addEvent('click', function(e) {
showLogViewer = !showLogViewer;
LocalPreferences.set('show_log_viewer', showLogViewer.toString());
window.qBittorrent.Client.showLogViewer(!window.qBittorrent.Client.isShowLogViewer());
LocalPreferences.set('show_log_viewer', window.qBittorrent.Client.isShowLogViewer().toString());
updateTabDisplay();
});

const updateTabDisplay = function() {
if (showRssReader) {
if (window.qBittorrent.Client.isShowRssReader()) {
$('showRssReaderLink').firstChild.style.opacity = '1';
$('mainWindowTabs').removeClass('invisible');
$('rssTabLink').removeClass('invisible');
Expand All @@ -1102,7 +1134,7 @@ window.addEventListener("DOMContentLoaded", function() {
$("transfersTabLink").click();
}

if (showSearchEngine) {
if (window.qBittorrent.Client.isShowSearchEngine()) {
$('showSearchEngineLink').firstChild.style.opacity = '1';
$('mainWindowTabs').removeClass('invisible');
$('searchTabLink').removeClass('invisible');
Expand All @@ -1116,7 +1148,7 @@ window.addEventListener("DOMContentLoaded", function() {
$("transfersTabLink").click();
}

if (showLogViewer) {
if (window.qBittorrent.Client.isShowLogViewer()) {
$('showLogViewerLink').firstChild.style.opacity = '1';
$('mainWindowTabs').removeClass('invisible');
$('logTabLink').removeClass('invisible');
Expand All @@ -1131,7 +1163,7 @@ window.addEventListener("DOMContentLoaded", function() {
}

// display no tabs
if (!showRssReader && !showSearchEngine && !showLogViewer)
if (!window.qBittorrent.Client.isShowRssReader() && !window.qBittorrent.Client.isShowSearchEngine() && !window.qBittorrent.Client.isShowLogViewer())
$('mainWindowTabs').addClass('invisible');
};

Expand All @@ -1154,6 +1186,8 @@ window.addEventListener("DOMContentLoaded", function() {
hideSearchTab();
hideRssTab();
hideLogTab();

LocalPreferences.set('selected_tab', 'transfers');
};

const hideTransfersTab = function() {
Expand All @@ -1168,6 +1202,16 @@ window.addEventListener("DOMContentLoaded", function() {
let searchTabInitialized = false;

return () => {
// we must wait until the panel is fully loaded before proceeding.
// this include's the panel's custom js, which is loaded via MochaUI.Panel's 'require' field.
// MochaUI loads these files asynchronously and thus all required libs may not be available immediately
if (!isSearchPanelLoaded) {
setTimeout(() => {
showSearchTab();
}, 100);
return;
}

if (!searchTabInitialized) {
window.qBittorrent.Search.init();
searchTabInitialized = true;
Expand All @@ -1178,6 +1222,8 @@ window.addEventListener("DOMContentLoaded", function() {
hideTransfersTab();
hideRssTab();
hideLogTab();

LocalPreferences.set('selected_tab', 'search');
};
})();

Expand All @@ -1203,6 +1249,8 @@ window.addEventListener("DOMContentLoaded", function() {
hideTransfersTab();
hideSearchTab();
hideLogTab();

LocalPreferences.set('selected_tab', 'rss');
};
})();

Expand All @@ -1216,6 +1264,16 @@ window.addEventListener("DOMContentLoaded", function() {
let logTabInitialized = false;

return () => {
// we must wait until the panel is fully loaded before proceeding.
// this include's the panel's custom js, which is loaded via MochaUI.Panel's 'require' field.
// MochaUI loads these files asynchronously and thus all required libs may not be available immediately
if (!isLogPanelLoaded) {
setTimeout(() => {
showLogTab();
}, 100);
return;
}

if (!logTabInitialized) {
window.qBittorrent.Log.init();
logTabInitialized = true;
Expand All @@ -1229,6 +1287,8 @@ window.addEventListener("DOMContentLoaded", function() {
hideTransfersTab();
hideSearchTab();
hideRssTab();

LocalPreferences.set('selected_tab', 'log');
};
})();

Expand All @@ -1251,6 +1311,12 @@ window.addEventListener("DOMContentLoaded", function() {
},
loadMethod: 'xhr',
contentURL: 'views/search.html',
require: {
js: ['scripts/search.js'],
Chocobo1 marked this conversation as resolved.
Show resolved Hide resolved
onload: () => {
isSearchPanelLoaded = true;
},
},
content: '',
column: 'searchTabColumn',
height: null
Expand Down Expand Up @@ -1292,6 +1358,9 @@ window.addEventListener("DOMContentLoaded", function() {
require: {
css: ['css/vanillaSelectBox.css'],
js: ['scripts/lib/vanillaSelectBox.js'],
onload: () => {
isLogPanelLoaded = true;
},
},
tabsURL: 'views/logTabs.html',
tabsOnload: function() {
Expand Down Expand Up @@ -1594,4 +1663,27 @@ window.addEventListener("load", () => {
window.qBittorrent.Cache.buildInfo.init();
window.qBittorrent.Cache.preferences.init();
window.qBittorrent.Cache.qbtVersion.init();

// switch to previously used tab
const previouslyUsedTab = LocalPreferences.get('selected_tab', 'transfers');
switch (previouslyUsedTab) {
case 'search':
if (window.qBittorrent.Client.isShowSearchEngine())
$('searchTabLink').click();
break;
case 'rss':
if (window.qBittorrent.Client.isShowRssReader())
$('rssTabLink').click();
break;
case 'log':
if (window.qBittorrent.Client.isShowLogViewer())
$('logTabLink').click();
break;
case 'transfers':
$('transfersTabLink').click();
break;
default:
console.error(`Unexpected 'selected_tab' value: ${previouslyUsedTab}`);
$('transfersTabLink').click();
};
});