external/uBlock
1
0
Fork 0
mirror of https://github.com/gorhill/uBlock.git synced 2024-11-13 10:17:34 +01:00
Code Issues Projects Releases Packages Wiki Activity

fix #1607

Browse source
This commit is contained in:
gorhill 2016-05-03 08:22:48 -04:00
parent a8cf54c3a0
commit 47b3e26942
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/js/ublock.js
View file

@ -1,7 +1,7 @@
/******************************************************************************* /*******************************************************************************
µBlock - a browser extension to block requests. uBlock Origin - a browser extension to block requests.
Copyright (C) 2014 Raymond Hill Copyright (C) 2014-2016 Raymond Hill
This program is free software: you can redistribute it and/or modify This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
@ -19,8 +19,6 @@
Home: https://github.com/gorhill/uBlock Home: https://github.com/gorhill/uBlock
*/ */
/* global vAPI, µBlock */
/******************************************************************************/ /******************************************************************************/
(function(){ (function(){
@ -55,6 +53,7 @@ var matchWhitelistDirective = function(url, hostname, directive) {
if ( directive.indexOf('*') === -1 ) { if ( directive.indexOf('*') === -1 ) {
return url === directive; return url === directive;
} }
// TODO: Revisit implementation to avoid creating a regex each time.
// Regex escape code inspired from: // Regex escape code inspired from:
// "Is there a RegExp.escape function in Javascript?" // "Is there a RegExp.escape function in Javascript?"
// http://stackoverflow.com/a/3561711 // http://stackoverflow.com/a/3561711
@ -177,7 +176,7 @@ var matchWhitelistDirective = function(url, hostname, directive) {
'#': [] '#': []
}; };
var reInvalidHostname = /[^a-z0-9.\-\[\]:]/; var reInvalidHostname = /[^a-z0-9.\-\[\]:]/;
var reHostnameExtractor = /([a-z0-9\[][a-z0-9.\-:]*[a-z0-9\]])\/(?:[^\x00-\x20\/]|$)[^\x00-\x20]*$/; var reHostnameExtractor = /([a-z0-9\[][a-z0-9.\-]*[a-z0-9\]])(?::[\d*]+)?\/(?:[^\x00-\x20\/]|$)[^\x00-\x20]*$/;
var lines = s.split(/[\n\r]+/); var lines = s.split(/[\n\r]+/);
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++ ) {