Merge remote-tracking branch 'janekptacijarabaci/ignoring@noframes'

Fixes #2110
greasemonkey · Mar 16, 2015 · 8f88a80 · 8f88a80
2 parents 56c2b84 + 8076784
commit 8f88a80
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/modules/ipcscript.js b/modules/ipcscript.js
@@ -14,6 +14,7 @@ function IPCScript(aScript) {
   this.matches = aScript.matches.map(function(m) { return m.pattern });
   this.name = aScript.name;
   this.namespace = aScript.namespace;
+  this.noframes = aScript.noframes;
   this.runAt = aScript.runAt;
   this.textContent = aScript.textContent;
   this.uuid = aScript.uuid;
@@ -71,6 +72,7 @@ IPCScript.prototype.info = function() {
       'matches': this.matches,
       'name': this.name,
       'namespace': this.namespace,
+      'noframes': this.noframes,
       // 'requires': ??? source URL?
       'resources': resources,
       'run-at': this.runAt,