Skip to content

Commit d7d544c

Browse files
committed
Squashed commit of the following:
commit 7c6cacc Author: Raymond Hill <[email protected]> Date: Sat Nov 3 08:52:51 2018 -0300 code review: finalize support for wasm-based hntrie commit 8596ed8 Merge: cbe1f2e 000eb82 Author: Raymond Hill <[email protected]> Date: Sat Nov 3 08:41:40 2018 -0300 Merge branch 'master' of github.com:gorhill/uBlock into trie-wasm commit cbe1f2e Merge: 270fc7f dbb7e80 Author: Raymond Hill <[email protected]> Date: Fri Nov 2 17:43:20 2018 -0300 Merge branch 'master' of github.com:gorhill/uBlock into trie-wasm commit 270fc7f Merge: d2a89cf d693d4f Author: Raymond Hill <[email protected]> Date: Fri Nov 2 16:21:08 2018 -0300 Merge branch 'master' of github.com:gorhill/uBlock into trie-wasm commit d2a89cf Merge: d7afc78 649f82f Author: Raymond Hill <[email protected]> Date: Fri Nov 2 14:54:58 2018 -0300 Merge branch 'master' of github.com:gorhill/uBlock into trie-wasm commit d7afc78 Author: Raymond Hill <[email protected]> Date: Fri Nov 2 13:56:11 2018 -0300 finalize wasm-based hntrie implementation commit e7b9e04 Author: Raymond Hill <[email protected]> Date: Fri Nov 2 08:14:02 2018 -0300 add first-pass implementation of wasm version of hntrie commit 1015cb3 Author: Raymond Hill <[email protected]> Date: Wed Oct 31 17:16:47 2018 -0300 back up draft work toward experimenting with wasm hntries
1 parent 000eb82 commit d7d544c

10 files changed

Lines changed: 47173 additions & 664 deletions

File tree

src/js/background.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@ if ( vAPI.webextFlavor === undefined ) {
3333

3434
/******************************************************************************/
3535

36-
var µBlock = (function() { // jshint ignore:line
36+
const µBlock = (function() { // jshint ignore:line
3737

38-
var oneSecond = 1000,
39-
oneMinute = 60 * oneSecond;
38+
const oneSecond = 1000,
39+
oneMinute = 60 * oneSecond;
4040

41-
var hiddenSettingsDefault = {
41+
const hiddenSettingsDefault = {
4242
assetFetchTimeout: 30,
4343
autoUpdateAssetFetchPeriod: 120,
4444
autoUpdatePeriod: 7,
@@ -56,7 +56,7 @@ var µBlock = (function() { // jshint ignore:line
5656
userResourcesLocation: 'unset'
5757
};
5858

59-
var whitelistDefault = [
59+
const whitelistDefault = [
6060
'about-scheme',
6161
'chrome-extension-scheme',
6262
'chrome-scheme',

0 commit comments

Comments
 (0)