Skip to content
This repository has been archived by the owner on Nov 15, 2017. It is now read-only.

Commit

Permalink
this fixes #237
Browse files Browse the repository at this point in the history
  • Loading branch information
gorhill committed Apr 18, 2014
1 parent 5cf9a3a commit 7b4b465
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 1 deletion.
10 changes: 10 additions & 0 deletions js/httpsb.js
Original file line number Diff line number Diff line change
Expand Up @@ -339,6 +339,11 @@ HTTPSB.autoCreateTemporarySiteScope = function(pageURL) {
if ( !this.isGlobalScopeKey(scopeKey) ) {
return;
}
// Do not auto-create a site-level scope if a matrix filtering is off.
// https://github.com/gorhill/httpswitchboard/issues/237
if ( this.getTemporaryMtxFiltering('*') !== true ) {
return;
}
// Do not auto-create a site-level scope if there is a whitelist rule
// for the domain or hostname of the pageURL
var pageDomain = this.URI.domainFromURI(pageURL);
Expand Down Expand Up @@ -417,6 +422,11 @@ HTTPSB.whitelistPermanently = function(scopeKey, type, hostname) {

HTTPSB.autoWhitelistTemporarilyPageDomain = function(pageURL) {
var scopeKey = this.temporaryScopeKeyFromPageURL(pageURL);
// Do not auto-whitelist if a matrix filtering is off.
// https://github.com/gorhill/httpswitchboard/issues/237
if ( this.getTemporaryMtxFiltering(scopeKey) !== true ) {
return false;
}
var domain = this.URI.domainFromURI(pageURL);
// 'rp' as in 'red pale', i.e. graylisted-blocked:
// Autowhitelist only if the domain is graylisted and blocked.
Expand Down
2 changes: 1 addition & 1 deletion manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"manifest_version": 2,
"name": "__MSG_extName__",
"short_name": "HTTPSB",
"version": "0.8.7.0",
"version": "0.8.7.1",
"description": "__MSG_extShortDesc__",
"icons": {
"16": "icon_16.png",
Expand Down

0 comments on commit 7b4b465

Please sign in to comment.