updatemuffler

commit ef132144d35af55e516af27732a981632f8e6336
parent 66278b2131e51cb7832f732c5b101e0c01c9a2f3
Author: Ryan Wolf <rwolf@borderstylo.com>
Date:   Tue,  4 May 2010 01:45:48 -0700

regex for naggers is stored in about:config

Diffstat:
M
chrome/content/naggerstomper.js
 | 
16
++++++++++++----
A
defaults/preferences/naggerstomper.js
 | 
4
++++
M
install.rdf
 | 
2
+-
M
makefile
 | 
2
+-

4 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/chrome/content/naggerstomper.js b/chrome/content/naggerstomper.js
@@ -1,11 +1,19 @@
 new function () {
   // TODO: nice UI for adding patterns
-  var nagRegexes = [
-    /^http:\/\/noscript.net\/\?ver=.*&prev=.*/,
-  ];
+
+  var getNaggers = function () {
+    // Get the "extensions.myext." branch
+    var prefService = Components.classes["@mozilla.org/preferences-service;1"].
+        getService(Components.interfaces.nsIPrefService);
+    var prefBranch = prefService.getBranch("extensions.naggerstomper.naggers.");
+    var keys = prefBranch.getChildList("", {});
+    return keys.map(function (key) {
+      return new RegExp(prefBranch.getCharPref(key));
+    });
+  };
 
   var isNag = function (url) {
-    return nagRegexes.some(function (reg) { return url.match(reg); });
+    return getNaggers().some(function (regex) { return url.match(regex); });
   };
 
   var closeTabIfNag = function (tab) {
diff --git a/defaults/preferences/naggerstomper.js b/defaults/preferences/naggerstomper.js
@@ -0,0 +1,4 @@
+pref(
+  "extensions.naggerstomper.naggers.noscript",
+  "^http:\/\/noscript.net\/\?ver=.*&prev=.*"
+);
diff --git a/install.rdf b/install.rdf
@@ -4,7 +4,7 @@
   <Description about="urn:mozilla:install-manifest">
     <em:id>naggerstomper@pseudony.ms</em:id>
     <em:name>Nagger Stomper</em:name>
-    <em:version>0.0.1</em:version>
+    <em:version>0.0.2</em:version>
     <em:type>2</em:type>
     <em:targetApplication>
       <Description>
diff --git a/makefile b/makefile
@@ -1,5 +1,5 @@
 package :
-					zip naggerstomper.xpi chrome/ chrome.manifest install.rdf
+					zip naggerstomper.xpi chrome/ defaults/ chrome.manifest install.rdf
 
 clean :
 					rm naggerstomper.xpi