Remove silly global_rulesets

semenko · diracdeltas · commit 27f6fef1f2f4 · 2014-01-03T10:49:10.000-08:00
A "global_ruleset" would've been a totally wildcard rule, "*".

There are zero of these in the current code, and if there were, I imagine it'd be an error.

Signed-off-by: Nick Semenkovich &lt;semenko@alum.mit.edu&gt;
diff --git a/chromium/rules.js b/chromium/rules.js
@@ -85,7 +85,6 @@ function RuleSets() {
     xhr.send(null);
     this.loadRuleSet(xhr);
   }
-  this.global_rulesets = this.targets["*"] ? this.targets["*"] : [];
 }
 
 RuleSets.prototype = {
@@ -190,7 +189,7 @@ RuleSets.prototype = {
     log(DBUG, "Ruleset cache miss for " + host);
 
     var tmp, t;
-    var results = this.global_rulesets.slice(0); // copy global_rulesets
+    var results = [];
     if (this.targets[host])
       results = results.concat(this.targets[host]);
     // replace each portion of the domain with a * in turn

Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,6 @@ function RuleSets() {`
`85`	`85`	`xhr.send(null);`
`86`	`86`	`this.loadRuleSet(xhr);`
`87`	`87`	`}`
`88`		`- this.global_rulesets = this.targets[""] ? this.targets[""] : [];`
`89`	`88`	`}`
`90`	`89`
`91`	`90`	`RuleSets.prototype = {`
`@@ -190,7 +189,7 @@ RuleSets.prototype = {`
`190`	`189`	`log(DBUG, "Ruleset cache miss for " + host);`
`191`	`190`
`192`	`191`	`var tmp, t;`
`193`		`- var results = this.global_rulesets.slice(0); // copy global_rulesets`
	`192`	`+ var results = [];`
`194`	`193`	`if (this.targets[host])`
`195`	`194`	`results = results.concat(this.targets[host]);`
`196`	`195`	`// replace each portion of the domain with a * in turn`