diff --git a/src/js/background.js b/src/js/background.js
index f23ec0c4c..735e8af1e 100644
--- a/src/js/background.js
+++ b/src/js/background.js
@@ -111,6 +111,8 @@ const µBlock = (( ) => { // jshint ignore:line
hiddenSettingsAdmin: {},
hiddenSettings: Object.assign({}, hiddenSettingsDefault),
+ noDashboard: false,
+
// Features detection.
privacySettingsSupported: vAPI.browserSettings instanceof Object,
cloudStorageSupported: vAPI.cloud instanceof Object,
diff --git a/src/js/dashboard.js b/src/js/dashboard.js
index 19f7a94a3..46dcadbef 100644
--- a/src/js/dashboard.js
+++ b/src/js/dashboard.js
@@ -84,7 +84,9 @@ const loadDashboardPanel = function(pane, first) {
tabButton.classList.add('selected');
tabButton.scrollIntoView();
uDom.nodeFromId('iframe').setAttribute('src', pane);
- vAPI.localStorage.setItem('dashboardLastVisitedPane', pane);
+ if ( pane !== 'no-dashboard.html' ) {
+ vAPI.localStorage.setItem('dashboardLastVisitedPane', pane);
+ }
};
if ( first ) {
return loadPane();
@@ -104,25 +106,48 @@ const onTabClickHandler = function(ev) {
loadDashboardPanel(ev.target.getAttribute('data-pane'));
};
-// https://github.com/uBlockOrigin/uBlock-issues/issues/106
-vAPI.messaging.send('dashboard', {
- what: 'canUpdateShortcuts',
-}).then(response => {
- document.body.classList.toggle('canUpdateShortcuts', response === true);
-});
+if ( self.location.hash.slice(1) === 'no-dashboard.html' ) {
+ document.body.classList.add('noDashboard');
+}
-vAPI.localStorage.getItemAsync('dashboardLastVisitedPane').then(value => {
- loadDashboardPanel(value !== null ? value : 'settings.html', true);
+(async ( ) => {
+ const results = await Promise.all([
+ // https://github.com/uBlockOrigin/uBlock-issues/issues/106
+ vAPI.messaging.send('dashboard', { what: 'dashboardConfig' }),
+ vAPI.localStorage.getItemAsync('dashboardLastVisitedPane'),
+ ]);
- uDom('.tabButton').on('click', onTabClickHandler);
+ {
+ const details = results[0];
+ document.body.classList.toggle(
+ 'canUpdateShortcuts',
+ details.canUpdateShortcuts === true
+ );
+ if ( details.noDashboard ) {
+ self.location.hash = '#no-dashboard.html';
+ document.body.classList.add('noDashboard');
+ } else if ( self.location.hash === '#no-dashboard.html' ) {
+ self.location.hash = '';
+ }
+ }
- // https://developer.mozilla.org/en-US/docs/Web/API/Window/beforeunload_event
- window.addEventListener('beforeunload', ( ) => {
- if ( discardUnsavedData(true) ) { return; }
- event.preventDefault();
- event.returnValue = '';
- });
-});
+ {
+ let pane = results[1];
+ if ( self.location.hash !== '' ) {
+ pane = self.location.hash.slice(1) || null;
+ }
+ loadDashboardPanel(pane !== null ? pane : 'settings.html', true);
+
+ uDom('.tabButton').on('click', onTabClickHandler);
+
+ // https://developer.mozilla.org/en-US/docs/Web/API/Window/beforeunload_event
+ window.addEventListener('beforeunload', ( ) => {
+ if ( discardUnsavedData(true) ) { return; }
+ event.preventDefault();
+ event.returnValue = '';
+ });
+ }
+})();
/******************************************************************************/
diff --git a/src/js/messaging.js b/src/js/messaging.js
index 693fa56fa..e107ace75 100644
--- a/src/js/messaging.js
+++ b/src/js/messaging.js
@@ -1214,8 +1214,11 @@ const onMessage = function(request, sender, callback) {
let response;
switch ( request.what ) {
- case 'canUpdateShortcuts':
- response = µb.canUpdateShortcuts;
+ case 'dashboardConfig':
+ response = {
+ canUpdateShortcuts: µb.canUpdateShortcuts,
+ noDashboard: µb.noDashboard,
+ };
break;
case 'getAutoCompleteDetails':
diff --git a/src/js/storage.js b/src/js/storage.js
index 02a03c371..2b70d42fa 100644
--- a/src/js/storage.js
+++ b/src/js/storage.js
@@ -97,23 +97,49 @@
const hsUser = this.hiddenSettings;
const results = await Promise.all([
- vAPI.adminStorage.get('toSet'),
+ vAPI.adminStorage.get([
+ 'advancedSettings',
+ 'disableDashboard',
+ 'disabledPopupPanelParts',
+ ]),
vAPI.storage.get('hiddenSettings'),
]);
- if (
- results[0] instanceof Object &&
- Array.isArray(results[0].hiddenSettings)
- ) {
- for ( const entry of results[0].hiddenSettings ) {
- if ( entry.length < 1 ) { continue; }
- const name = entry[0];
- if ( hsDefault.hasOwnProperty(name) === false ) { continue; }
- const value = entry.length < 2
- ? hsDefault[name]
- : this.hiddenSettingValueFromString(name, entry[1]);
- if ( value === undefined ) { continue; }
- hsDefault[name] = hsAdmin[name] = hsUser[name] = value;
+ if ( results[0] instanceof Object ) {
+ const {
+ advancedSettings,
+ disableDashboard,
+ disabledPopupPanelParts
+ } = results[0];
+ if ( Array.isArray(advancedSettings) ) {
+ for ( const entry of advancedSettings ) {
+ if ( entry.length < 1 ) { continue; }
+ const name = entry[0];
+ if ( hsDefault.hasOwnProperty(name) === false ) { continue; }
+ const value = entry.length < 2
+ ? hsDefault[name]
+ : this.hiddenSettingValueFromString(name, entry[1]);
+ if ( value === undefined ) { continue; }
+ hsDefault[name] = hsAdmin[name] = hsUser[name] = value;
+ }
+ }
+ µBlock.noDashboard = disableDashboard === true;
+ if ( Array.isArray(disabledPopupPanelParts) ) {
+ const partNameToBit = new Map([
+ [ 'globalStats', 0b00010 ],
+ [ 'basicTools', 0b00100 ],
+ [ 'extraTools', 0b01000 ],
+ [ 'firewall', 0b10000 ],
+ ]);
+ let bits = hsDefault.popupPanelDisabledSections;
+ for ( const part of disabledPopupPanelParts ) {
+ const bit = partNameToBit.get(part);
+ if ( bit === undefined ) { continue; }
+ bits |= bit;
+ }
+ hsDefault.popupPanelDisabledSections =
+ hsAdmin.popupPanelDisabledSections =
+ hsUser.popupPanelDisabledSections = bits;
}
}
@@ -1260,15 +1286,15 @@ self.addEventListener('hiddenSettingsChanged', ( ) => {
// values are left to the user's choice.
µBlock.restoreAdminSettings = async function() {
- let toSet = {};
+ let toOverwrite = {};
let data;
try {
const store = await vAPI.adminStorage.get([
'adminSettings',
- 'toSet',
+ 'toOverwrite',
]) || {};
- if ( store.toSet instanceof Object ) {
- toSet = store.toSet;
+ if ( store.toOverwrite instanceof Object ) {
+ toOverwrite = store.toOverwrite;
}
const json = store.adminSettings;
if ( typeof json === 'string' && json !== '' ) {
@@ -1315,9 +1341,9 @@ self.addEventListener('hiddenSettingsChanged', ( ) => {
binNotEmpty = true;
}
- if ( Array.isArray(toSet.trustedSiteDirectives) ) {
- µBlock.netWhitelistDefault = toSet.trustedSiteDirectives.slice();
- bin.netWhitelist = toSet.trustedSiteDirectives.slice();
+ if ( Array.isArray(toOverwrite.trustedSiteDirectives) ) {
+ µBlock.netWhitelistDefault = toOverwrite.trustedSiteDirectives.slice();
+ bin.netWhitelist = toOverwrite.trustedSiteDirectives.slice();
binNotEmpty = true;
} else if ( Array.isArray(data.whitelist) ) {
bin.netWhitelist = data.whitelist;