Skip to content

Commit

Permalink
Support disabling suspendTabsUntilReady in Firefox
Browse files Browse the repository at this point in the history
The value of `suspendTabsUntilReady` was disregarded in Firefox and
uBO defaulted to always defer tab loading until it was ready.

This commit allows to disable the deferring of tab loading in
Firefox. The new valid values for `suspendTabsUntilReady` are:
- `unset`: leave it to the platform to pick the optimal
  behavior (default)
- `no`: do no suspend tab loading at launch time
- `yes`: suspend tab loading at launch time
  • Loading branch information
gorhill committed Feb 19, 2019
1 parent 928ab91 commit 87feb47
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 3 deletions.
7 changes: 6 additions & 1 deletion src/js/background.js
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ const µBlock = (function() { // jshint ignore:line
requestJournalProcessPeriod: 1000,
selfieAfter: 11,
strictBlockingBypassDuration: 120,
suspendTabsUntilReady: false,
suspendTabsUntilReady: 'unset',
userResourcesLocation: 'unset'
};

Expand Down Expand Up @@ -104,6 +104,11 @@ const µBlock = (function() { // jshint ignore:line
if ( out.hasOwnProperty(k) ) { out[k] = o[k]; }
}
self.log.verbosity = out.consoleLogLevel;
if ( typeof out.suspendTabsUntilReady === 'boolean' ) {
out.suspendTabsUntilReady = out.suspendTabsUntilReady
? 'yes'
: 'unset';
}
}
}
catch(ex) {
Expand Down
6 changes: 6 additions & 0 deletions src/js/storage.js
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,12 @@
this.hiddenSettings[key] = hs[key];
}
}
if ( typeof this.hiddenSettings.suspendTabsUntilReady === 'boolean' ) {
this.hiddenSettings.suspendTabsUntilReady =
this.hiddenSettings.suspendTabsUntilReady
? 'yes'
: 'unset';
}
}
if ( vAPI.localStorage.getItem('immediateHiddenSettings') === null ) {
this.saveImmediateHiddenSettings();
Expand Down
6 changes: 4 additions & 2 deletions src/js/traffic.js
Original file line number Diff line number Diff line change
Expand Up @@ -1002,8 +1002,10 @@ return {
if (
vAPI.net.onBeforeReady instanceof Object &&
(
vAPI.net.onBeforeReady.experimental !== true ||
µBlock.hiddenSettings.suspendTabsUntilReady
vAPI.net.onBeforeReady.experimental !== true &&
µBlock.hiddenSettings.suspendTabsUntilReady !== 'no' ||
vAPI.net.onBeforeReady.experimental &&
µBlock.hiddenSettings.suspendTabsUntilReady === 'yes'
)
) {
vAPI.net.onBeforeReady.start();
Expand Down

0 comments on commit 87feb47

Please sign in to comment.