diff options
| author | gorhill <rhill@raymondhill.net> | 2015-09-13 10:26:36 -0400 |
|---|---|---|
| committer | gorhill <rhill@raymondhill.net> | 2015-09-13 10:26:36 -0400 |
| commit | 90a2c608bb6ebcce3579130316652c05ceebaa72 (patch) | |
| tree | 0feca9194d56ae03b82d2e1b471dc093dbd2dcb7 /src | |
| parent | 45415a8de60601d8bba3610c4af075a2ebf94ec3 (diff) | |
| download | uBlock-90a2c608bb6ebcce3579130316652c05ceebaa72.zip uBlock-90a2c608bb6ebcce3579130316652c05ceebaa72.tar.gz uBlock-90a2c608bb6ebcce3579130316652c05ceebaa72.tar.bz2 | |
this fixes #708
Diffstat (limited to 'src')
| -rw-r--r-- | src/js/background.js | 3 | ||||
| -rw-r--r-- | src/js/storage.js | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/js/background.js b/src/js/background.js index 5da45ac..d14c827 100644 --- a/src/js/background.js +++ b/src/js/background.js @@ -142,7 +142,8 @@ return { remoteBlacklists: {}, oldListToNewListMap: { "assets/thirdparties/adblock.gardar.net/is.abp.txt": "http://adblock.gardar.net/is.abp.txt", - "assets/thirdparties/adblock.schack.dk/block.txt": "https://adblock.schack.dk/block.txt", + "assets/thirdparties/adblock.schack.dk/block.txt": "https://adblock.dk/block.csv", + "https://adblock.schack.dk/block.txt": "https://adblock.dk/block.csv", "assets/thirdparties/dl.dropboxusercontent.com/u/1289327/abpxfiles/filtri.txt": "https://dl.dropboxusercontent.com/u/1289327/abpxfiles/filtri.txt", "assets/thirdparties/easylist-downloads.adblockplus.org/advblock.txt": "https://easylist-downloads.adblockplus.org/advblock.txt", "assets/thirdparties/easylist-downloads.adblockplus.org/bitblock.txt": "https://easylist-downloads.adblockplus.org/bitblock.txt", diff --git a/src/js/storage.js b/src/js/storage.js index 6d2eeda..c7b5c42 100644 --- a/src/js/storage.js +++ b/src/js/storage.js @@ -953,12 +953,15 @@ } // Migrate assets affected by the change to their new name. + var reExternalURL = /^https?:\/\//; var newListKey; for ( var oldListKey in stockLists ) { if ( stockLists.hasOwnProperty(oldListKey) === false ) { continue; } - oldListKey = 'assets/thirdparties/' + oldListKey; + if ( reExternalURL.test(oldListKey) === false ) { + oldListKey = 'assets/thirdparties/' + oldListKey; + } if ( µb.oldListToNewListMap.hasOwnProperty(oldListKey) === false ) { continue; } |