Mirrors/uBlock
1
0
Fork 0
mirror of https://github.com/gorhill/uBlock.git synced 2024-11-02 00:42:45 +01:00
Code Issues Releases Wiki Activity

this fixes #171

Browse Source
This commit is contained in:
gorhill 2015-05-04 17:10:55 -04:00
parent 7ffbfdaf10
commit 65183f7180
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/js/pagestore.js
View File

@ -19,7 +19,7 @@
Home: https://github.com/gorhill/uBlock Home: https://github.com/gorhill/uBlock
*/ */
/* global vAPI, µBlock */ /* global µBlock */
/******************************************************************************* /*******************************************************************************
@ -435,7 +435,7 @@ PageStore.prototype.getNetFilteringSwitch = function() {
// https://github.com/chrisaljoudi/uBlock/issues/1078 // https://github.com/chrisaljoudi/uBlock/issues/1078
// Use both the raw and normalized URLs. // Use both the raw and normalized URLs.
this.netFiltering = µb.getNetFilteringSwitch(tabContext.normalURL); this.netFiltering = µb.getNetFilteringSwitch(tabContext.normalURL);
if ( this.netFiltering && tabContext.rawURL !== tabContext.pageURL ) { if ( this.netFiltering && tabContext.rawURL !== tabContext.normalURL ) {
this.netFiltering = µb.getNetFilteringSwitch(tabContext.rawURL); this.netFiltering = µb.getNetFilteringSwitch(tabContext.rawURL);
} }
this.netFilteringReadTime = Date.now(); this.netFilteringReadTime = Date.now();

13
src/js/ublock.js
View File

@ -180,6 +180,12 @@ var matchWhitelistDirective = function(url, hostname, directive) {
var line, matches, key, directive; var line, matches, key, directive;
for ( var i = 0; i < lines.length; i++ ) { for ( var i = 0; i < lines.length; i++ ) {
line = lines[i].trim(); line = lines[i].trim();
// https://github.com/gorhill/uBlock/issues/171
// Skip empty lines
if ( line === '' ) {
continue;
}
// Don't throw out commented out lines: user might want to fix them // Don't throw out commented out lines: user might want to fix them
if ( line.charAt(0) === '#' ) { if ( line.charAt(0) === '#' ) {
key = '#'; key = '#';
@ -208,9 +214,14 @@ var matchWhitelistDirective = function(url, hostname, directive) {
} }
} }
// https://github.com/gorhill/uBlock/issues/171
// Skip empty keys
if ( key === '' ) {
continue;
}
// Be sure this stays fixed: // Be sure this stays fixed:
// https://github.com/chrisaljoudi/uBlock/issues/185 // https://github.com/chrisaljoudi/uBlock/issues/185
if ( whitelist.hasOwnProperty(key) === false ) { if ( whitelist.hasOwnProperty(key) === false ) {
whitelist[key] = []; whitelist[key] = [];
} }